Fix build breakage in harfbuzz when building with LODE on macOS
By default, configure does not search for the pkgconf command in $LODE_HOME/opt/bin and, as a result, PKG_CONFIG is not set in config_host.mk. Change-Id: Ia0512c0506dec268594c3156d6c5133fe3baaeab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184283 Tested-by: Jenkins Reviewed-by: Patrick Luby <guibomacdev@gmail.com>
This commit is contained in:
committed by
Patrick Luby
parent
595fd58cf1
commit
ea0489fe2d
@@ -693,6 +693,19 @@ if test "$build_os" = "cygwin" -o -n "$WSL_ONLY_AS_HELPER"; 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
|
||||
else
|
||||
case "$build_os" in
|
||||
darwin*)
|
||||
# convenience check for a custom pkgconf used by meson - needs to be a version that uses macOS
|
||||
# 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,,[$PATH:$LODE_HOME/opt/bin])
|
||||
if test -z "$PKG_CONFIG"; then
|
||||
AC_MSG_WARN([pkgconf not found - pkgconf is required to build harfbuzz])
|
||||
add_warning "please add PKG_CONFIG=/path/to/pkgconf to autogen.input or put it in PATH, a macOS version of pkgconf is required to build harfbuzz"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Set the ENABLE_LTO variable
|
||||
|
||||
@@ -3,4 +3,3 @@
|
||||
--enable-dbgutil
|
||||
--enable-odk
|
||||
--disable-online-update
|
||||
PKG_CONFIG=pkgconf
|
||||
|
||||
@@ -2,4 +2,3 @@
|
||||
--build=x86_64-apple-darwin
|
||||
--enable-odk
|
||||
--disable-online-update
|
||||
PKG_CONFIG=pkgconf
|
||||
|
||||
@@ -4,4 +4,3 @@
|
||||
--enable-optimized
|
||||
--enable-odk
|
||||
--disable-online-update
|
||||
PKG_CONFIG=pkgconf
|
||||
|
||||
@@ -10,4 +10,3 @@
|
||||
--with-package-format=dmg
|
||||
--enable-odk
|
||||
--enable-mergelibs=more
|
||||
PKG_CONFIG=pkgconf
|
||||
|
||||
Reference in New Issue
Block a user