KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

include: improve 'gettext-version' fixup

Browse source 
* 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 <nico@openwrt.org>

SVN-Revision: 44225
This commit is contained in:
Nicolas Thill 2015-01-31 08:15:51 +00:00
parent d8263c3025
commit ce9b49046c
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/autotools.mk
View file

@ -84,14 +84,22 @@ define patch_libtool_target
endef endef
define gettext_version_target define gettext_version_target
cd $(PKG_BUILD_DIR) && \ (cd $(PKG_BUILD_DIR) && \
GETTEXT_VERSION=$(shell $(STAGING_DIR_HOST)/bin/gettext -V | $(STAGING_DIR_HOST)/bin/sed -ne '1s/.* //p') && \ GETTEXT_VERSION=$(shell $(STAGING_DIR_HOST)/bin/gettext -V | $(STAGING_DIR_HOST)/bin/sed -ne '1s/.* //p') && \
$(STAGING_DIR_HOST)/bin/sed \ $(STAGING_DIR_HOST)/bin/sed \
-i $(PKG_BUILD_DIR)/configure.ac \ -i $(PKG_BUILD_DIR)/configure.ac \
-e "s/AM_GNU_GETTEXT_VERSION(\[.*\])/AM_GNU_GETTEXT_VERSION(\[$$$$GETTEXT_VERSION\])/g" && \ -e "s/AM_GNU_GETTEXT_VERSION(.*)/AM_GNU_GETTEXT_VERSION(\[$$$$GETTEXT_VERSION\])/g" && \
$(STAGING_DIR_HOST)/bin/autopoint --force $(STAGING_DIR_HOST)/bin/autopoint --force \
);
endef 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)),) ifneq ($(filter patch-libtool,$(PKG_FIXUP)),)
Hooks/Configure/Pre += patch_libtool_target Hooks/Configure/Pre += patch_libtool_target
endif endif
@ -116,10 +124,6 @@ ifneq ($(filter autoreconf,$(PKG_FIXUP)),)
endif endif
endif endif
ifneq ($(filter gettext-version,$(PKG_FIXUP)),)
Hooks/Configure/Pre += gettext_version_target
endif
HOST_FIXUP?=$(PKG_FIXUP) HOST_FIXUP?=$(PKG_FIXUP)
HOST_LIBTOOL_PATHS?=$(if $(PKG_LIBTOOL_PATHS),$(PKG_LIBTOOL_PATHS),.) HOST_LIBTOOL_PATHS?=$(if $(PKG_LIBTOOL_PATHS),$(PKG_LIBTOOL_PATHS),.)