mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

Makefile.autotools.in: fix libtool patching

Browse Source 
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: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard
2009-12-30 13:42:01 +01:00
parent c63c2faf55
commit 073af428ef
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
package/Makefile.autotools.in
View File

@@ -140,12 +140,13 @@ define LIBTOOL_PATCH_HOOK
$(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" -a \ $(Q)if test "$$($$(PKG)_LIBTOOL_PATCH)" = "YES" -a \
"$$($$(PKG)_AUTORECONF)" != "YES"; then \ "$$($$(PKG)_AUTORECONF)" != "YES"; then \
for i in `find $$($$(PKG)_SRCDIR) -name ltmain.sh`; do \ 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 \ done \
fi fi
endef 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 $(2)_POST_PATCH_HOOKS += LIBTOOL_PATCH_HOOK
endif endif