Fix autoreconf libtool patching
authorprzemyslaw <przemyslaw.wrzos@calyptech.com>
Wed, 20 Mar 2013 20:09:42 +0000 (20:09 +0000)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sun, 24 Mar 2013 21:15:58 +0000 (22:15 +0100)
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>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/pkg-autotools.mk

index 995c68596b519df434caa970f04ca03b17cc8636..d8d7e6d47026b34dd00a8176615c60f009df2717 100644 (file)
@@ -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\