From 073af428efc21d7717c003e93a098d0767de3b0c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 30 Dec 2009 13:42:01 +0100 Subject: Makefile.autotools.in: fix libtool patching Fixes two issues with libtool patching: - It seems like the default value for _LIBTOOL_PATCH only gets set AFTER the ifdef check, so the conditional was never taken. Fix it by instead checking that it isn't explicitly set to not do the patching instead. - The $i in the libtool patching for loop needed an extra level of escaping to work. Signed-off-by: Peter Korsgaard --- package/Makefile.autotools.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'package/Makefile.autotools.in') diff --git a/package/Makefile.autotools.in b/package/Makefile.autotools.in index 09f44b46f..f0f189f90 100644 --- a/package/Makefile.autotools.in +++ b/package/Makefile.autotools.in @@ -140,12 +140,13 @@ define LIBTOOL_PATCH_HOOK $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" -a \ "$$($$(PKG)_AUTORECONF)" != "YES"; then \ for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ - toolchain/patch-kernel.sh $${i%/*} package buildroot-libtool.patch; \ + toolchain/patch-kernel.sh $$$${i%/*} package buildroot-libtool.patch; \ done \ fi endef -ifeq ($($(2)_LIBTOOL_PATCH),YES) +# default values are not evaluated yet, so don't rely on this defaulting to YES +ifneq ($($(2)_LIBTOOL_PATCH),NO) $(2)_POST_PATCH_HOOKS += LIBTOOL_PATCH_HOOK endif -- cgit v1.2.3