Commit 073af428 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Makefile.autotools.in: fix libtool patching 



Fixes two issues with libtool patching:

- It seems like the default value for <package>_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: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent c63c2faf

package/Makefile.autotools.in

+3 −2
Original line number Diff line number Diff line
@@ -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