summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2011-07-07 00:08:26 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2011-07-07 00:08:26 +0200
commit81d7b7c700bf0a30283fd71b266a3180c21c80ac (patch)
treefecef47d3137f12e10f3dfe8125014ea8c440189 /packages
parent3185dac9cc43c87caada7f4b181924cbdd6b44bf (diff)
downloadembtoolkit-81d7b7c700bf0a30283fd71b266a3180c21c80ac.tar.gz
embtoolkit-81d7b7c700bf0a30283fd71b266a3180c21c80ac.tar.bz2
embtoolkit-81d7b7c700bf0a30283fd71b266a3180c21c80ac.tar.xz
Packages: gettext: Give ability to build for host and addd gettex-0.18.1.1
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages')
-rw-r--r--packages/misc/gettext/gettext.kconfig30
-rw-r--r--packages/misc/gettext/gettext.mk27
-rw-r--r--packages/misc/misc.mk1
3 files changed, 50 insertions, 8 deletions
diff --git a/packages/misc/gettext/gettext.kconfig b/packages/misc/gettext/gettext.kconfig
index 1d3110a..d67fbb1 100644
--- a/packages/misc/gettext/gettext.kconfig
+++ b/packages/misc/gettext/gettext.kconfig
@@ -23,6 +23,13 @@
# \date December 2009
################################################################################
+config EMBTK_HOST_HAVE_GETTEXT
+ bool
+ select EMBTK_GETTEXT_PKG_IS_TARGZ
+ default y
+ help
+ gettext for host development machine.
+
config EMBTK_HAVE_GETTEXT
bool "Have gettext"
select EMBTK_GETTEXT_PKG_IS_TARGZ
@@ -56,26 +63,39 @@ config EMBTK_HAVE_GETTEXT
www.gnu.org/software/gettext/FAQ.html
choice
prompt "gettext version you wish"
- depends on EMBTK_HAVE_GETTEXT
+ depends on EMBTK_HAVE_GETTEXT || EMBTK_HOST_HAVE_GETTEXT
help
Here you can choose which version of gettext you want to use.
- config EMBTK_GETTEXT_VERSION_0_17
- bool "gettext-0.17"
+ config EMBTK_GETTEXT_VERSION_0_18_1_1
+ bool "gettext-0.18.1.1"
config EMBTK_GETTEXT_VERSION_0_16_1
bool "gettext-0.16.1"
endchoice
config EMBTK_GETTEXT_VERSION_STRING
string
- default "0.17" if EMBTK_GETTEXT_VERSION_0_17
- default "0.16.1" if EMBTK_GETTEXT_VERSION_0_16_1
+ default "0.18.1.1" if EMBTK_GETTEXT_VERSION_0_18_1_1
+ default "0.16.1" if EMBTK_GETTEXT_VERSION_0_16_1
config EMBTK_GETTEXT_NEED_PATCH
bool
+ select EMBTK_GETTEXT_HOST_NEED_PATCH
config EMBTK_GETTEXT_NEED_AUTORECONF
bool
+ select EMBTK_GETTEXT_HOST_NEED_AUTORECONF
config EMBTK_GETTEXT_PKG_IS_TARGZ
bool
+ select EMBTK_GETTEXT_HOST_PKG_IS_TARGZ
config EMBTK_GETTEXT_PKG_IS_TARBZ2
bool
+ select EMBTK_GETTEXT_HOST_PKG_IS_TARBZ2
+
+config EMBTK_GETTEXT_HOST_NEED_PATCH
+ bool
+config EMBTK_GETTEXT_HOST_NEED_AUTORECONF
+ bool
+config EMBTK_GETTEXT_HOST_PKG_IS_TARGZ
+ bool
+config EMBTK_GETTEXT_HOST_PKG_IS_TARBZ2
+ bool
diff --git a/packages/misc/gettext/gettext.mk b/packages/misc/gettext/gettext.mk
index 3aac5ae..15c5757 100644
--- a/packages/misc/gettext/gettext.mk
+++ b/packages/misc/gettext/gettext.mk
@@ -32,6 +32,7 @@ GETTEXT_PACKAGE := gettext-$(GETTEXT_VERSION).tar.gz
GETTEXT_SRC_DIR := $(PACKAGES_BUILD)/gettext-$(GETTEXT_VERSION)
GETTEXT_BUILD_DIR := $(PACKAGES_BUILD)/gettext-$(GETTEXT_VERSION)
+# gettext for target
GETTEXT_BINS = autopoint gettext gettext.sh msgcat msgcomm msgen \
msgfilter msggrep msgmerge msguniq recode-sr-latin \
envsubst gettextize msgattrib msgcmp msgconv msgexec \
@@ -57,9 +58,6 @@ gettext_install:
@test -e $(GETTEXT_BUILD_DIR)/.patchlibtool || \
$(MAKE) $(GETTEXT_BUILD_DIR)/.patchlibtool
-download_gettext:
- $(call embtk_download_pkg,gettext)
-
gettext_clean:
$(call embtk_cleanup_pkg,gettext)
@@ -74,3 +72,26 @@ $(GETTEXT_BUILD_DIR)/.patchlibtool:
-i "s;/usr/$(LIBDIR)/libgettextlib.la;$(SYSROOT)/$(LIBDIR)/libgettextlib.la;" \
$(SYSROOT)/usr/$(LIBDIR)/libgettextsrc.la
@touch $@
+
+# gettext for host development machine
+GETTEXT_HOST_NAME := $(GETTEXT_NAME)
+GETTEXT_HOST_VERSION := $(GETTEXT_VERSION)
+GETTEXT_HOST_SITE := $(GETTEXT_SITE)
+GETTEXT_HOST_SITE_MIRROR1 := $(GETTEXT_SITE_MIRROR1)
+GETTEXT_HOST_SITE_MIRROR2 := $(GETTEXT_SITE_MIRROR2)
+GETTEXT_HOST_SITE_MIRROR3 := $(GETTEXT_SITE_MIRROR3)
+GETTEXT_HOST_PATCH_SITE := $(GETTEXT_PATCH_SITE)
+GETTEXT_HOST_PACKAGE := $(GETTEXT_PACKAGE)
+GETTEXT_HOST_SRC_DIR := $(TOOLS_BUILD)/gettext-$(GETTEXT_VERSION)
+GETTEXT_HOST_BUILD_DIR := $(TOOLS_BUILD)/gettext-$(GETTEXT_VERSION)
+
+GETTEXT_HOST_CONFIGURE_OPTS := --disable-java --disable-native-java \
+ --disable-openmp --with-included-gettext --with-included-glib \
+ --with-included-libcroco --with-included-libxml
+
+gettext_host_install:
+ $(call embtk_install_hostpkg,gettext_host)
+
+# common tagets
+download_gettext download_gettext_host:
+ $(call embtk_download_pkg,gettext)
diff --git a/packages/misc/misc.mk b/packages/misc/misc.mk
index 7133a1a..1548c60 100644
--- a/packages/misc/misc.mk
+++ b/packages/misc/misc.mk
@@ -29,6 +29,7 @@ ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_EXPAT) += expat_install
#gettext
include $(EMBTK_ROOT)/packages/misc/gettext/gettext.mk
ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_GETTEXT) += gettext_install
+HOSTTOOLS_COMPONENTS-$(CONFIG_EMBTK_HOST_HAVE_GETTEXT) += gettext_host_install
#GLib
include $(EMBTK_ROOT)/packages/misc/glib/glib.mk