From 68be1e6b8de06cb71ca19103744584e3be101fc8 Mon Sep 17 00:00:00 2001 From: jow Date: Tue, 11 Oct 2011 18:15:12 +0000 Subject: [PATCH] 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 --- include/autotools.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; \ -- 2.11.0