summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-10-19 11:58:38 +0200
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2014-10-19 11:58:38 +0200
commit1345feebdde712bdc75aae36b1490c2e3496a18d (patch)
tree9c355c0c7444d1b0a5cd15a86bcb572a55c75257 /packages
parent26d93641f30e3586cd16494cc41706b15283cf53 (diff)
downloadembtoolkit-1345feebdde712bdc75aae36b1490c2e3496a18d.tar.gz
embtoolkit-1345feebdde712bdc75aae36b1490c2e3496a18d.tar.bz2
embtoolkit-1345feebdde712bdc75aae36b1490c2e3496a18d.tar.xz
Host tools: move gettext under dir dedicated for host tools
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'packages')
-rw-r--r--packages/htools/gettext/gettext.kconfig (renamed from packages/misc/gettext/gettext.kconfig)0
-rw-r--r--packages/htools/gettext/gettext.mk (renamed from packages/misc/gettext/gettext.mk)13
-rw-r--r--packages/htools/hosttools-buildopts.kconfig5
-rw-r--r--packages/htools/hosttools-buildopts.mk3
-rw-r--r--packages/misc/misc.kconfig3
-rw-r--r--packages/misc/misc.mk3
6 files changed, 15 insertions, 12 deletions
diff --git a/packages/misc/gettext/gettext.kconfig b/packages/htools/gettext/gettext.kconfig
index 8ae773a..8ae773a 100644
--- a/packages/misc/gettext/gettext.kconfig
+++ b/packages/htools/gettext/gettext.kconfig
diff --git a/packages/misc/gettext/gettext.mk b/packages/htools/gettext/gettext.mk
index 264072b..21658d2 100644
--- a/packages/misc/gettext/gettext.mk
+++ b/packages/htools/gettext/gettext.mk
@@ -23,12 +23,12 @@
# \date December 2009
################################################################################
-GETTEXT_HOST_NAME := gettext
-GETTEXT_HOST_VERSION := $(call embtk_get_pkgversion,gettext_host)
-GETTEXT_HOST_SITE := http://ftp.gnu.org/pub/gnu/gettext
-GETTEXT_HOST_PACKAGE := gettext-$(GETTEXT_HOST_VERSION).tar.gz
-GETTEXT_HOST_SRC_DIR := $(embtk_toolsb)/gettext-$(GETTEXT_HOST_VERSION)
-GETTEXT_HOST_BUILD_DIR := $(embtk_toolsb)/gettext-$(GETTEXT_HOST_VERSION)
+GETTEXT_HOST_NAME := gettext
+GETTEXT_HOST_VERSION := $(call embtk_pkg_version,gettext_host)
+GETTEXT_HOST_SITE := http://ftp.gnu.org/pub/gnu/gettext
+GETTEXT_HOST_PACKAGE := gettext-$(GETTEXT_HOST_VERSION).tar.gz
+GETTEXT_HOST_SRC_DIR := $(embtk_toolsb)/gettext-$(GETTEXT_HOST_VERSION)
+GETTEXT_HOST_BUILD_DIR := $(embtk_toolsb)/gettext-$(GETTEXT_HOST_VERSION)-build
GETTEXT_HOST_CONFIGURE_OPTS := --disable-java
GETTEXT_HOST_CONFIGURE_OPTS += --disable-native-java
@@ -37,3 +37,4 @@ GETTEXT_HOST_CONFIGURE_OPTS += --with-included-gettext
GETTEXT_HOST_CONFIGURE_OPTS += --with-included-glib
GETTEXT_HOST_CONFIGURE_OPTS += --with-included-libcroco
GETTEXT_HOST_CONFIGURE_OPTS += --with-included-libxml
+GETTEXT_HOST_CONFIGURE_OPTS += --enable-static --disable-shared
diff --git a/packages/htools/hosttools-buildopts.kconfig b/packages/htools/hosttools-buildopts.kconfig
index a7b2119..cffaeeb 100644
--- a/packages/htools/hosttools-buildopts.kconfig
+++ b/packages/htools/hosttools-buildopts.kconfig
@@ -75,6 +75,11 @@ config EMBTK_HAVE_MKIMAGE
u-boot mkimage tool.
#
+# gettext
+#
+source packages/htools/gettext/gettext.kconfig
+
+#
# gperf for host
#
source packages/htools/gperf/gperf.kconfig
diff --git a/packages/htools/hosttools-buildopts.mk b/packages/htools/hosttools-buildopts.mk
index e014dcc..ae99d5f 100644
--- a/packages/htools/hosttools-buildopts.mk
+++ b/packages/htools/hosttools-buildopts.mk
@@ -38,6 +38,9 @@ $(call embtk_include_hostpkg,ccache_host)
include packages/htools/fakeroot/vars.mk
$(call embtk_include_hostpkg,fakeroot_host)
+# gettext
+$(call embtk_include_hostpkg,gettext_host)
+
# gmake
$(call embtk_include_hostpkg,gmake_host)
diff --git a/packages/misc/misc.kconfig b/packages/misc/misc.kconfig
index d1bc85f..dcf5af5 100644
--- a/packages/misc/misc.kconfig
+++ b/packages/misc/misc.kconfig
@@ -26,9 +26,6 @@
# expat
source packages/misc/expat/expat.kconfig
-# gettext
-source packages/misc/gettext/gettext.kconfig
-
# glib
source packages/misc/glib/glib.kconfig
diff --git a/packages/misc/misc.mk b/packages/misc/misc.mk
index b8ffd4f..e5a00bd 100644
--- a/packages/misc/misc.mk
+++ b/packages/misc/misc.mk
@@ -28,9 +28,6 @@ embtk_pkgincdir := packages/misc
# expat
$(call embtk_include_pkg,expat)
-# gettext
-$(call embtk_include_hostpkg,gettext_host)
-
# glib
$(call embtk_include_pkg,glib)
$(call embtk_include_hostpkg,glib_host)