From: Rosen Penev Date: Wed, 17 Feb 2021 10:51:10 +0000 (-0800) Subject: autotools.mk: fix gettext fixup X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=90b1524f75023ad0f441e82773ca9e9b5d513e1a;p=openwrt%2Fstaging%2Fadrian.git autotools.mk: fix gettext fixup The update to gettext 0.21 broke packages that use autotools and gettext because the sed line was failing with the new version. Fix with a better sed expression. Signed-off-by: Rosen Penev --- diff --git a/include/autotools.mk b/include/autotools.mk index 4b48b38992..eb52b55924 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -90,7 +90,7 @@ endef define gettext_version_target (cd $(PKG_BUILD_DIR) && \ - GETTEXT_VERSION=$(shell $(STAGING_DIR_HOSTPKG)/bin/gettext -V | $(STAGING_DIR_HOST)/bin/sed -ne '1s/.*\([0-9]\.[0-9]\{2\}\.[0-9]\).*/\1/p' ) && \ + GETTEXT_VERSION=$(shell $(STAGING_DIR_HOSTPKG)/bin/gettext -V | $(STAGING_DIR_HOST)/bin/sed -rne '1s/.*\b([0-9]\.[0-9]+(\.[0-9]+)?)\b.*/\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" && \