configure.ac | 5 +++--
external/zstd/UnpackedTarball_zstd.mk | 8 ++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 659a562512cc48af4a4c1d079cac8e3c45ce6bc2
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue May 6 12:19:48 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue May 6 14:44:10 2025 +0200
fix extracting zstd under git-bash (dangling symlinks)
git-bash/MSYS doesn't create links by default, so extracting the tarball
fails with:
tar: zstd-1.5.7/tests/cli-tests/bin/unzstd: Cannot create symlink to
‘zstd’: No such file or directory
tar: Exiting with failure status due to previous errors
Unlike in an earlier case with zxing (see
04585baf973742b0a400b53209391a99ae959d99) those links are only dangling
temporarily/due to the extraction order, the target it points to is
created later, but of course same underlying problem/same solution.
Change-Id: I7cca52bb694ceee329cb66407d32c84de8f258a7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184987
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/external/zstd/UnpackedTarball_zstd.mk
b/external/zstd/UnpackedTarball_zstd.mk
index 7770ffe1add0..8c2a820f5629 100644
--- a/external/zstd/UnpackedTarball_zstd.mk
+++ b/external/zstd/UnpackedTarball_zstd.mk
@@ -11,4 +11,12 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,zstd))
$(eval $(call gb_UnpackedTarball_set_tarball,zstd,$(ZSTD_TARBALL)))
+ifneq ($(MSYSTEM),)
+# the tarball contains effectively dangling symlinks (links to files extracted
later)
+# that breaks in git-bash/msys since MSYS defaults to not create links
+ifeq ($(filter winsymlinks%,$(MSYS)),)
+$(call gb_UnpackedTarball_get_target,zstd): export MSYS:=$(MSYS) winsymlinks
+endif
+endif
+
# vim: set noet sw=4 ts=4:
commit 29b930ae634e32f2b922bd11a32add02e6a4d7c4
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue May 6 12:12:30 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue May 6 14:43:56 2025 +0200
configure.ac: enforce pkgconf-2.4.3.exe on windows/error if not found
protect the users from themselves, too many don't see/respect the
warning message and picking up pkgconf/pkg-config from cygwin or the
wsl distro just won't work with the windows-style path needed for
meson.
Change-Id: Ib3748587c6134f0e90d4772d507d44be5894a69f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184986
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
diff --git a/configure.ac b/configure.ac
index efe9f6431181..974f2b0bb7be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -696,8 +696,9 @@ if test "$build_os" = "cygwin" -o -n "$WSL_ONLY_AS_HELPER";
then
# that would already set the PKG_CONFIG var and then bypass/skip this
autoselection
AC_PATH_PROG(PKG_CONFIG,pkgconf-2.4.3.exe,,[$PATH:$LODE_HOME/opt/bin])
if test -z "$PKG_CONFIG"; then
- AC_MSG_WARN([pkgconf-2.4.3.exe not found - A windows version of
pkgconf is required to build harfbuzz])
- add_warning "please add PKG_CONFIG=/path/to/pkgconf-2.4.3.exe to
autogen.input or put it in PATH, a windows version of pkgconf is required to
build harfbuzz"
+ AC_MSG_ERROR([
+ A windows version of pkgconf is required to build harfbuzz.
+ Add PKG_CONFIG=/path/to/pkgconf-2.4.3.exe to autogen.input or put
it in PATH])
fi
else
case "$build_os" in
