Patchwork [1/1] Fix autoreconf libtool patching

login
register
mail settings
Submitter Przemyslaw Wrzos
Date March 21, 2013, 6:09 a.m.
Message ID <1363846182-6178-1-git-send-email-przemyslaw.wrzos@calyptech.com>
Download mbox | patch
Permalink /patch/229560/
State Accepted
Commit 3400663620e039427c704f6c73b061d23ac54a4a
Headers show

Comments

Przemyslaw Wrzos - March 21, 2013, 6:09 a.m.
From: przemyslaw <przemyslaw.wrzos@calyptech.com>

Some ltmain.sh files enclose the version number in quotes. This is
already handled corretly by pkg-autotools.mk in LIBTOOL_PATCH_HOOK.
This patch adds the same fix for AUTORECONF_HOOK.

Signed-off-by: przemyslaw <przemyslaw.wrzos@calyptech.com>
---
 package/pkg-autotools.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Peter Korsgaard - March 24, 2013, 9:16 p.m.
>>>>> "Przemyslaw" == Przemyslaw Wrzos <przemyslaw.wrzos@calyptech.com> writes:

 Przemyslaw> From: przemyslaw <przemyslaw.wrzos@calyptech.com>
 Przemyslaw> Some ltmain.sh files enclose the version number in quotes. This is
 Przemyslaw> already handled corretly by pkg-autotools.mk in LIBTOOL_PATCH_HOOK.
 Przemyslaw> This patch adds the same fix for AUTORECONF_HOOK.

Committed, thanks.

Patch

diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index 995c685..d8d7e6d 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -185,7 +185,8 @@  define AUTORECONF_HOOK
 	$(Q)cd $$($$(PKG)_SRCDIR) && $(AUTORECONF) $$($$(PKG)_AUTORECONF_OPT)
 	$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES"; then \
 		for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \
-			ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$$$i | sed 's/\([0-9].[0-9]*\).*/\1/'`; \
+			ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' $$$$i | \
+			sed -e 's/\([0-9].[0-9]*\).*/\1/' -e 's/\"//'`; \
 			if test $$$${ltmain_version} = "1.5"; then \
 				support/scripts/apply-patches.sh $$$${i%/*} support/libtool buildroot-libtool-v1.5.patch; \
 			elif test $$$${ltmain_version} = "2.2"; then\