Author: nico Date: 2015-01-31 09:15:51 +0100 (Sat, 31 Jan 2015) New Revision: 44225
Modified: trunk/include/autotools.mk Log: include: improve 'gettext-version' fixup * enclose the fixup in brackets * match anything in the call to AM_GNU_GETTEXT_VERSION * call it early (before autoreconf if both are specified) * chain a call to autoreconf since it messes with configure.ac Signed-off-by: Nicolas Thill <[email protected]> Modified: trunk/include/autotools.mk =================================================================== --- trunk/include/autotools.mk 2015-01-31 08:15:46 UTC (rev 44224) +++ trunk/include/autotools.mk 2015-01-31 08:15:51 UTC (rev 44225) @@ -84,14 +84,22 @@ 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 + (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 gettext-version,$(PKG_FIXUP)),) + Hooks/Configure/Pre += gettext_version_target + ifeq ($(filter no-autoreconf,$(PKG_FIXUP)),) + Hooks/Configure/Pre += autoreconf_target + endif +endif + ifneq ($(filter patch-libtool,$(PKG_FIXUP)),) Hooks/Configure/Pre += patch_libtool_target endif @@ -116,11 +124,7 @@ 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),.) HOST_AUTOMAKE_PATHS?=$(if $(PKG_AUTOMAKE_PATHS),$(PKG_AUTOMAKE_PATHS),.) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
