diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-05-27 13:01:00 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-05-30 21:45:03 +0200 |
| commit | 0d4133edfedd8ca641db39d3eec9dc7146c8fa4e (patch) | |
| tree | b2b99ffd0e25d466baa6f3fcfad46f0849e62a8a /package/gettext/gettext.mk | |
| parent | a94650c184f78620eb63d2d25065c4ea3ceec8d8 (diff) | |
| download | buildroot-0d4133edfedd8ca641db39d3eec9dc7146c8fa4e.tar.gz buildroot-0d4133edfedd8ca641db39d3eec9dc7146c8fa4e.zip | |
gettext: don't patch different the host and target build
Until now, the gettext source code was being patched differently for
the host and the target build, which is going to be incompatible with
out-of-tree build. The difference is that the gettext tools could be
disabled in the target build, but are always enabled on the host
build.
Therefore, this commit switches the gettext package to using proper
patches against the relevant configure.ac and Makefile.am
files. gettext is now being autoreconfigured. Configuration options
are also passed for the host variant, in order to disable the build of
a large number of things we don't care about.
Finally, the two existing patches are renamed to include a number in
their filename.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/gettext/gettext.mk')
| -rw-r--r-- | package/gettext/gettext.mk | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk index 8dc701e044..90619287b7 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)) |
