[LEDE-DEV] [PATCH 2/3] autotools: use correct version for gettext FIXUP
Dirk Neukirchen
dirkneukirchen at web.de
Wed Oct 12 07:14:44 PDT 2016
0.19.8.1 gettext-full uses "archive-version" of 0.19.8
to replace makros, leading to breakage of PKG_FIXUP:=gettext-version
Signed-off-by: Dirk Neukirchen <dirkneukirchen at web.de>
---
include/autotools.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/autotools.mk b/include/autotools.mk
index 259569b..63edd5b 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -85,7 +85,7 @@ 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') && \
+ GETTEXT_VERSION=$(shell $(STAGING_DIR)/host/bin/gettext -V | $(STAGING_DIR_HOST)/bin/sed -ne '1s/.*\([0-9]\.[0-9]\{2\}\.[0-9]\).*/\1/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" && \
--
2.10.0
More information about the Lede-dev
mailing list