[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - lpsolve/UnpackedTarball_lpsolve.mk solenv/gbuild

[Michael Meeks]

 lpsolve/UnpackedTarball_lpsolve.mk |    1 +
 solenv/gbuild/UnpackedTarball.mk   |   11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit f1e7eeb83c18bce720d49e0e55704abd09ab96f7
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Thu Jul 11 20:51:48 2013 +0100

    fdo#66826 - Allow parameters to be passed to patch such as --binary
    
    Change-Id: I575b2721ffd08adabc3184b04ec302025a1feef2
    Reviewed-on: https://gerrit.libreoffice.org/4850
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/lpsolve/UnpackedTarball_lpsolve.mk b/lpsolve/UnpackedTarball_lpsolve.mk
index 09cb1a2..f9074a2 100644
--- a/lpsolve/UnpackedTarball_lpsolve.mk
+++ b/lpsolve/UnpackedTarball_lpsolve.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,lpsolve,3))
 
 ifeq ($(OS_FOR_BUILD),WNT)
 
+$(eval $(call gb_UnpackedTarball_set_patchflags,lpsolve,--binary))
 $(eval $(call gb_UnpackedTarball_add_patches,lpsolve,\
 	lpsolve/lp_solve_5.5-windows.patch \
 ))
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index a62b42a..5f5af1f 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -143,7 +143,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) -f -s "-p$$pl" < "$$p"; \
+				$(GNUPATCH) $(UNPACKED_PATCHFLAGS) -f -s "-p$$pl" < "$$p"; \
 				if test "$$?" -ne 0; then echo "Patch FAILED: $$p"; exit 1; fi;\
 			done && \
 		) \
@@ -195,6 +195,7 @@ $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FILES :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_FIX_EOL :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHES :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHLEVEL := $(gb_UnpackedTarball_PATCHLEVEL_DEFAULT)
+$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHFLAGS :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_POST_ACTION :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PRE_ACTION :=
 
@@ -250,6 +251,14 @@ $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHLEVEL := $(2)
 
 endef
 
+# Add patch flags to be passed to patch for all patches cf. fdo#66826
+#
+# gb_UnpackedTarball_set_patchlevel unpacked level
+define gb_UnpackedTarball_set_patchflags
+$(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHFLAGS := $(2)
+
+endef
+
 # Add a patch to be applied on the unpacked files
 #
 # gb_UnpackedTarball_add_patch unpacked patch