From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 11 Oct 2011 18:15:12 +0000 (+0000)
Subject: include: autotools.mk: do not fail in patch-libtool fixup if patch is already applied
X-Git-Tag: reboot~15843
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e7b094e8496d84578961b7ff2591aa62d913f9c2;p=openwrt%2Fstaging%2Fblogic.git

include: autotools.mk: do not fail in patch-libtool fixup if patch is already applied

SVN-Revision: 28419
---

diff --git a/include/autotools.mk b/include/autotools.mk
index 1472b5a781ed..1ce25bc9f6f5 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; \