[Libreoffice-commits] core.git: solenv/gbuild

[Michael Stahl]

 solenv/gbuild/UnpackedTarball.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ffcdefe83ab043edef943657d5dedef75faaa5b0
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Apr 17 14:25:19 2013 +0200

    gbuild: UnpackedTarball: do not query for input on "reversed" patch
    
    This can apparently happen when interrupting a build; reproducible with
    "touch workdir/*/UnpackedTarget/*openssl* && make openssl".
    
    The -f parameter would apparently silently ignore some mal-formed
    patches but at least it rejects potentially reversed ones,
    which causes the "error handler" in gb_UnpackedTarball__command
    to touch the "prepare" target so the next make is successful.
    
    Change-Id: I7bbd7d9385d990a69214a3a2d9bb20b5a7173748

diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index dd47a35..2342dc9 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -140,7 +140,7 @@ $(call gb_Helper_abbreviate_dirs,\
 			for p in $(UNPACKED_PATCHES); do \
 				pl=$(UNPACKED_PATCHLEVEL); \
 				s=$${p##*.}; case "$$s" in [0-9]$(CLOSE_PAREN) pl="$$s"; ;; esac ; \
-				$(GNUPATCH) -s "-p$$pl" < "$$p"; \
+				$(GNUPATCH) -f -s "-p$$pl" < "$$p"; \
 				if test "$$?" -ne 0; then echo "Patch FAILED: $$p"; exit 1; fi;\
 			done && \
 		) \