From: jow Date: Wed, 10 Oct 2012 17:53:51 +0000 (+0000) Subject: autotools.mk: add a gettext-version PKG_FIXUP (#11236) X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;ds=sidebyside;h=4f32cbce8720442d8be8b96f590cf27ab1074331;hp=ece31e7779f676c17d10f7f68efacd7735d89db9;p=openwrt-working-2016%2F.git 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 --- 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),.)