diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-07-11 20:51:48 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-07-11 20:54:35 +0100 |
| commit | e962805b31074d6b6a2ed0db6452769448337553 (patch) | |
| tree | 1797619243963a5d3c45e2456d4d695bce1c9a1c /solenv | |
| parent | bfc060597078ff19fffbcbe21fb1dd41655a9e4c (diff) | |
fdo#66826 - Allow parameters to be passed to patch such as --binary
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/UnpackedTarball.mk | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index ab2d6ff0a23d..d75cc23e0c72 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" --fuzz=0 < "$$p"; \ + $(GNUPATCH) $(UNPACKED_PATCHFLAGS) -f -s "-p$$pl" --fuzz=0 < "$$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 |