solenv/gbuild/UnpackedTarball.mk | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 2340536cf478f95e33b718d3f69da5345fc4d2b4
Author: David Tardon <dtar...@redhat.com>
Date: Thu Mar 29 14:56:44 2018 +0200
tdf#115396 fix mode of files installed from externals
Change-Id: I608f46235f2e80e74f6900831d13e082b167cfce
Reviewed-on: https://gerrit.libreoffice.org/52074
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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)) \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
