diff options
author | David Tardon <dtardon@redhat.com> | 2018-03-29 14:56:44 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2018-04-03 10:25:11 +0200 |
commit | b69abb3058d54aa59e56cb2224a648e7040c1a9a (patch) | |
tree | 4c114e96dd4cad430d02e2874615031af7dbe850 /solenv | |
parent | ae4260e6ba6e948b253d0d426b168b8ffdfe5ade (diff) |
tdf#115396 fix mode of files installed from externals
Change-Id: I608f46235f2e80e74f6900831d13e082b167cfce
Reviewed-on: https://gerrit.libreoffice.org/52144
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 4cb868abaf789afe3f2b4bc65454c21c08666a78)
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/UnpackedTarball.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index 9654d42fe2de..37913c8c7369 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -358,6 +358,7 @@ endef define gb_UnpackedTarbal__make_pattern_rule $(call gb_UnpackedTarball_get_dir,$(1))/%$(2) : $$(if $$(wildcard $$@),,$$(call gb_Output_error,file $$@ does not exist in the tarball)) + $$(if $$(UNPACKED_MODE),chmod $$(UNPACKED_MODE) $$@ &&) \ touch $$@ $(eval gb_UnpackedTarball_PATTERN_RULES_$(1) += $(2)) @@ -372,6 +373,7 @@ endef define gb_UnpackedTarbal__make_file_rule $(call gb_UnpackedTarball_get_dir,$(1))/$(2) : $$(if $$(wildcard $$@),,$$(call gb_Output_error,file $$@ does not exist in the tarball)) + $$(if $$(UNPACKED_MODE),chmod $$(UNPACKED_MODE) $$@ &&) \ touch $$@ endef @@ -388,6 +390,7 @@ endef define gb_UnpackedTarball_mark_output_file $(call gb_UnpackedTarball_get_final_target,$(1)) : $(call gb_UnpackedTarball_get_dir,$(1))/$(2) $(call gb_UnpackedTarball_get_dir,$(1))/$(2) : $(call gb_UnpackedTarball_get_target,$(1)) +$(call gb_UnpackedTarball_get_dir,$(1))/$(2) : UNPACKED_MODE := 644 $(if $(suffix $(2)),\ $(call gb_UnpackedTarbal__ensure_pattern_rule,$(1),$(suffix $(2))),\ $(call gb_UnpackedTarbal__make_file_rule,$(1),$(2)) \ |