aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-10-10 17:53:51 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-10-10 17:53:51 +0000
commit88194208ed5768851685a91582f836df3a267c58 (patch)
treefd82810c3ac16e6d8edee171639ff4a5dc88e6ea
parent2fd918a872dcc56a3b7dbc8280143319dd873f0f (diff)
downloadupstream-88194208ed5768851685a91582f836df3a267c58.tar.gz
upstream-88194208ed5768851685a91582f836df3a267c58.tar.bz2
upstream-88194208ed5768851685a91582f836df3a267c58.zip
autotools.mk: add a gettext-version PKG_FIXUP (#11236)
This fixup aligns the required gettext version in shipped macros to the one available in $(STAGING_DIR_HOST). git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33708 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/autotools.mk13
1 files changed, 13 insertions, 0 deletions
diff --git a/include/autotools.mk b/include/autotools.mk
index 8796598569..7ebeff6c76 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -83,6 +83,15 @@ define patch_libtool_target
$(PKG_BUILD_DIR)))
endef
+define gettext_version_target
+ cd $(PKG_BUILD_DIR) && \
+ GETTEXT_VERSION=$(shell $(STAGING_DIR_HOST)/bin/gettext -V | $(STAGING_DIR_HOST)/bin/sed -ne '1s/.* //p') && \
+ $(STAGING_DIR_HOST)/bin/sed \
+ -i $(PKG_BUILD_DIR)/configure.ac \
+ -e "s/AM_GNU_GETTEXT_VERSION(\[.*\])/AM_GNU_GETTEXT_VERSION(\[$$$$GETTEXT_VERSION\])/g" && \
+ $(STAGING_DIR_HOST)/bin/autopoint --force
+endef
+
ifneq ($(filter patch-libtool,$(PKG_FIXUP)),)
Hooks/Configure/Pre += patch_libtool_target
endif
@@ -107,6 +116,10 @@ ifneq ($(filter autoreconf,$(PKG_FIXUP)),)
endif
endif
+ifneq ($(filter gettext-version,$(PKG_FIXUP)),)
+ Hooks/Configure/Pre += gettext_version_target
+endif
+
HOST_FIXUP?=$(PKG_FIXUP)
HOST_LIBTOOL_PATHS?=$(if $(PKG_LIBTOOL_PATHS),$(PKG_LIBTOOL_PATHS),.)