solenv/gbuild/UnpackedTarball.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6fee94e76df21c614ca4504d430394404ace018b
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Apr 30 14:00:32 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Wed Apr 30 16:23:42 2025 +0200
preserve symlinks when keeping a copy of unpacked tarball (patches=1)
zxing contains dangling symlinks to an optional submodule
make with patches=1 (to create copy of the extracted dir in preparation
for genpatch) fails for zxing because of the missing submodule:
"cp -r foo foo.org" fails with "cp <danglingsymlinktosubmodule>: No
such file or directory"
telling cp to not dereference symlinks/to copy them as-is solves that
problem.
Change-Id: I0fe7f0bcb21307be99cbeaf9704480df62ff96be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184826
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 04614bf5bfce..4995687b268e 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -150,7 +150,7 @@ $(call gb_Helper_abbreviate_dirs,\
) \
$(if $(gb_KEEP_PRISTINE), \
rm -fr $(call gb_UnpackedTarball_get_pristine_dir,$(2))
&& \
- cp -r $(gb_UnpackedTarball_workdir)/$(2) $(call
gb_UnpackedTarball_get_pristine_dir,$(2)) && \
+ cp -r -P $(gb_UnpackedTarball_workdir)/$(2) $(call
gb_UnpackedTarball_get_pristine_dir,$(2)) && \
) \
touch $(1) \
)\
