[pacman-dev] [PATCH] Ignore failure to patch during autogen.sh

Allan McRae allan at archlinux.org
Wed Oct 9 21:00:43 EDT 2013


patch -N ignores the previously applied patch but still returns 1.
This causes a git build with a reused source directory to fail.
---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index d11badc..588e63d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
 #!/bin/sh -xu
 
 autoreconf -i
-(cd build-aux && patch -Np0 -i ltmain-asneeded.patch)
+(cd build-aux && (patch -Np0 -i ltmain-asneeded.patch || true))
-- 
1.8.4



More information about the pacman-dev mailing list