configure.ac | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
New commits: commit ca48e42cc18b0988a02fc9ce594c3979601e7be0 Author: Christian Lohmaier <[email protected]> AuthorDate: Wed Jun 25 13:34:49 2025 +0200 Commit: Christian Lohmaier <[email protected]> CommitDate: Wed Jun 25 18:47:08 2025 +0200 wsl-as-helper: allow windows-style path for PKG_CONFIG in autogen.input the windows builds needs a windows version of pkgconf for use with meson and the way to point to it is to define the corresponding PKG_CONFIG variable in autogen.input (that then bypasses the corresponding attempts to autodetect by AC_PATH_PROG / PKG_CHECK_MODULES that would otherwise pick up pkg-config/pkgconf from the wsl container) without the call to PathFormat you had to specify it as an wsl-style path: PKG_CONFIG=/mnt/e/lo/pkgconf-2.4.3/build/pkgconf.exe with the patch you can also use the windows style form, either mixed form (with forward slashes) or native form (bashslashes): PKG_CONFIG=E:/lo/pkgconfig-2.4.3/build/pkgconf.exe PKG_CONFIG=E:\lo\pkgconfig-2.4.3uild\pkgconf.exe Change-Id: I61899235ca31ee11787e227678c77ecc3de9a4df Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186973 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/configure.ac b/configure.ac index a5ee782a9e9f..8a5992f8cb45 100644 --- a/configure.ac +++ b/configure.ac @@ -337,13 +337,18 @@ dnl =================================================================== WSL_ONLY_AS_HELPER= if test -n "$WSL_DISTRO_NAME" && $(echo $PATH |grep -q -e mingw64 -e clangarm64); then WSL_ONLY_AS_HELPER=TRUE + shortpath_cmd=$(wslpath -m $srcdir/solenv/bin/shortpath.cmd) + if test -n "$PKG_CONFIG"; then + # make sure it is specified in a unix form/a path that wsl can access + PathFormat "$PKG_CONFIG" + PKG_CONFIG="$formatted_path_unix" + fi AC_ARG_WITH([strawberry-perl-portable], [AS_HELP_STRING([--with-strawberry-perl-portable], [Specify the base path to strawberry perl portable])], [], [AC_MSG_ERROR( [for the moment strawberry-perl-portable is a requirement, feel free to replace it])]) - shortpath_cmd=$(wslpath -m $srcdir/solenv/bin/shortpath.cmd) PathFormat "$with_strawberry_perl_portable" if test ! -f "$formatted_path_unix/perl/bin/perl.exe" -o ! -d "$formatted_path_unix/c/bin"; then AC_MSG_ERROR([$formatted_path doesn't contain perl or the utilities - sure you provided the base path?])
