diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-10-11 18:15:12 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-10-11 18:15:12 +0000 |
| commit | 68be1e6b8de06cb71ca19103744584e3be101fc8 (patch) | |
| tree | 23fd441b9f5bf894c35d11c2ce35928a13ca53cf | |
| parent | 51c679306396137aa16c06e52238525b0fa17368 (diff) | |
include: autotools.mk: do not fail in patch-libtool fixup if patch is already applied
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28419 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/autotools.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/autotools.mk b/include/autotools.mk index 1472b5a781..1ce25bc9f6 100644 --- a/include/autotools.mk +++ b/include/autotools.mk @@ -56,7 +56,7 @@ define patch_libtool lt_version="$$$$($$(STAGING_DIR_HOST)/bin/sed -ne 's,^[[:space:]]*VERSION=\([0-9]\.[0-9]\+\).*,\1,p' $$$$lt)"; \ case "$$$$lt_version" in \ 1.5|2.2|2.4) echo "autotools.mk: Found libtool v$$$$lt_version - applying patch to $$$$lt"; \ - (cd $$$$(dirname $$$$lt) && $$(PATCH) -s -p1 < $$(TOPDIR)/tools/libtool/files/libtool-v$$$$lt_version.patch) ;; \ + (cd $$$$(dirname $$$$lt) && $$(PATCH) -N -s -p1 < $$(TOPDIR)/tools/libtool/files/libtool-v$$$$lt_version.patch || true) ;; \ *) echo "autotools.mk: error: Unsupported libtool version v$$$$lt_version - cannot patch $$$$lt"; exit 1 ;; \ esac; \ done; \ |