configure.ac | 11 +++++++++++
distro-configs/Jenkins/Win32_dev_master.conf | 1 -
distro-configs/Jenkins/Win32_rel_master.conf | 1 -
distro-configs/Jenkins/Win64_dev_master.conf | 1 -
distro-configs/Jenkins/Win64_rel_master.conf | 1 -
distro-configs/Jenkins/windows_msc_dbgutil_32 | 1 -
distro-configs/LibreOfficeWin32.conf | 1 -
distro-configs/LibreOfficeWin64.conf | 1 -
distro-configs/LibreOfficeWinArm64.conf | 1 -
9 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit d107b16848b8e79b6df74321f22f3fb94ffff3a1
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Tue Apr 15 13:51:25 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Apr 15 17:37:46 2025 +0200
autodetect pkgconf-2.4.3.exe on windows/not everyone uses distro-config
without using the distro-config that sets PKG_CONFIG, configure won't
pick the windows version of pkgconf and the harfbuzz build then fails
beause the graphite and icu .pc files cannot be found.
Add an autodetection similar to the one for MESON as a convenience for
building on windows. With that it is enough to have it in PATH or
installed into $LODE_HOME/opt/bin
Can always be overridden by explicitly adding PKG_CONFIG=/path/to/file
into autogen.input
Change-Id: Ia8ea0dffd34e7a97fb28c99ac3f6b561c5dab193
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184221
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Tested-by: Jenkins
diff --git a/configure.ac b/configure.ac
index d75f26a4d0a9..14caef9949ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -684,6 +684,17 @@ if test -z "$SED"; then
AC_MSG_ERROR([install sed to run this script])
fi
+if test "$build_os" = "cygwin" -o -n "$WSL_ONLY_AS_HELPER"; then
+ # convenience check for a custom pkgconf used by meson - needs to be a
version that uses windows
+ # style paths. Needs to be checked before the configure-switches that use
PKG_CHECK_MODULES as
+ # 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"
+ fi
+fi
+
# Set the ENABLE_LTO variable
# ===================================================================
AC_MSG_CHECKING([whether to use link-time optimization])
diff --git a/distro-configs/Jenkins/Win32_dev_master.conf
b/distro-configs/Jenkins/Win32_dev_master.conf
index 08f7c9893d71..7ccda1beb829 100644
--- a/distro-configs/Jenkins/Win32_dev_master.conf
+++ b/distro-configs/Jenkins/Win32_dev_master.conf
@@ -2,4 +2,3 @@
--enable-dbgutil
--enable-odk
--disable-online-update
-PKG_CONFIG=pkgconf-2.4.3.exe
diff --git a/distro-configs/Jenkins/Win32_rel_master.conf
b/distro-configs/Jenkins/Win32_rel_master.conf
index 1654ecaa0e4b..3eb0e9da5694 100644
--- a/distro-configs/Jenkins/Win32_rel_master.conf
+++ b/distro-configs/Jenkins/Win32_rel_master.conf
@@ -1,4 +1,3 @@
--host=i686-pc-cygwin
--enable-odk
--disable-online-update
-PKG_CONFIG=pkgconf-2.4.3.exe
diff --git a/distro-configs/Jenkins/Win64_dev_master.conf
b/distro-configs/Jenkins/Win64_dev_master.conf
index c1193fc426b8..3960c4e5bf23 100644
--- a/distro-configs/Jenkins/Win64_dev_master.conf
+++ b/distro-configs/Jenkins/Win64_dev_master.conf
@@ -1,4 +1,3 @@
--enable-dbgutil
--enable-odk
--disable-online-update
-PKG_CONFIG=pkgconf-2.4.3.exe
diff --git a/distro-configs/Jenkins/Win64_rel_master.conf
b/distro-configs/Jenkins/Win64_rel_master.conf
index 2b7e78fab69c..d4ec76d28cb2 100644
--- a/distro-configs/Jenkins/Win64_rel_master.conf
+++ b/distro-configs/Jenkins/Win64_rel_master.conf
@@ -1,3 +1,2 @@
--enable-odk
--disable-online-update
-PKG_CONFIG=pkgconf-2.4.3.exe
diff --git a/distro-configs/Jenkins/windows_msc_dbgutil_32
b/distro-configs/Jenkins/windows_msc_dbgutil_32
index cf85e27bfb02..b7827644df9f 100644
--- a/distro-configs/Jenkins/windows_msc_dbgutil_32
+++ b/distro-configs/Jenkins/windows_msc_dbgutil_32
@@ -3,4 +3,3 @@
--disable-dependency-tracking
--enable-odk
--disable-online-update
-PKG_CONFIG=pkgconf-2.4.3.exe
diff --git a/distro-configs/LibreOfficeWin32.conf
b/distro-configs/LibreOfficeWin32.conf
index 5e5014c57f9b..2a9145b7c260 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -14,4 +14,3 @@
--enable-mergelibs
--enable-lto
--enable-odk
-PKG_CONFIG=pkgconf-2.4.3.exe
diff --git a/distro-configs/LibreOfficeWin64.conf
b/distro-configs/LibreOfficeWin64.conf
index 95f44a072e12..6fbe87776c2b 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -15,4 +15,3 @@
--enable-mergelibs=more
--enable-lto
--enable-odk
-PKG_CONFIG=pkgconf-2.4.3.exe
diff --git a/distro-configs/LibreOfficeWinArm64.conf
b/distro-configs/LibreOfficeWinArm64.conf
index 3996d6ad03db..a052e9bcfc4c 100644
--- a/distro-configs/LibreOfficeWinArm64.conf
+++ b/distro-configs/LibreOfficeWinArm64.conf
@@ -13,4 +13,3 @@
--enable-mergelibs
--enable-lto
--enable-odk
-PKG_CONFIG=pkgconf-2.4.3.exe
