summaryrefslogtreecommitdiffstats
path: root/package/gettext/gettext.mk
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2013-06-02 16:33:05 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2013-06-02 16:33:05 +0200
commit1ba51d2fbddd5650f8caea0a327b9031238ad843 (patch)
tree05d5df7b487e76597b34cb0b1fc9543525169a62 /package/gettext/gettext.mk
parent0c94aa549cc8cf483bc8c3443a2b1f772d5d180b (diff)
parentfb2f3d58bde6aaac12b62eeb16492c93329b8713 (diff)
downloadbuildroot-novena-1ba51d2fbddd5650f8caea0a327b9031238ad843.tar.gz
buildroot-novena-1ba51d2fbddd5650f8caea0a327b9031238ad843.zip
Merge branch 'next'
Diffstat (limited to 'package/gettext/gettext.mk')
-rw-r--r--package/gettext/gettext.mk26
1 files changed, 14 insertions, 12 deletions
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 8dc701e04..90619287b 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -9,6 +9,8 @@ GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
GETTEXT_INSTALL_STAGING = YES
GETTEXT_LICENSE = GPLv2+
GETTEXT_LICENSE_FILES = COPYING
+GETTEXT_AUTORECONF = YES
+HOST_GETTEXT_AUTORECONF = YES
GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
HOST_GETTEXT_DEPENDENCIES = # we don't want the libiconv dependency
@@ -22,6 +24,18 @@ GETTEXT_CONF_OPT += \
--disable-native-java \
--disable-csharp \
--disable-relocatable \
+ --without-emacs \
+ --disable-tools
+
+HOST_GETTEXT_CONF_OPT = \
+ --disable-libasprintf \
+ --disable-acl \
+ --disable-openmp \
+ --disable-rpath \
+ --disable-java \
+ --disable-native-java \
+ --disable-csharp \
+ --disable-relocatable \
--without-emacs
# Force build with NLS support, otherwise libintl is not built
@@ -42,19 +56,7 @@ define GETTEXT_INSTALL_TARGET_CMDS
cp -dpf $(STAGING_DIR)/usr/lib/libintl*.so* $(TARGET_DIR)/usr/lib/
endef
endif
-# Ditch the tools since they're off and pull other dependencies
-define GETTEXT_DISABLE_TOOLS
- $(SED) 's/runtime gettext-tools/runtime/' $(@D)/Makefile.in
-endef
endif # GETTEXT_TOOLS = n
-# The tools tests build fails with full toolchain without threads
-define GETTEXT_DISABLE_TESTS
- $(SED) 's/m4 tests/m4/' $(@D)/gettext-tools/Makefile.in
-endef
-
-GETTEXT_POST_PATCH_HOOKS += GETTEXT_DISABLE_TOOLS
-GETTEXT_POST_PATCH_HOOKS += GETTEXT_DISABLE_TESTS
-
$(eval $(autotools-package))
$(eval $(host-autotools-package))