configure.ac | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
New commits: commit 648ace303a4a93f6b3f2e96a1b388cd3af6f27c8 Author: Michael Stahl <[email protected]> AuthorDate: Mon Aug 18 13:08:40 2025 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Tue Oct 14 23:44:52 2025 +0200 rhbz#2354168 configure: workaround bogus "dbus-1" libs DBUS_LIBS contains -L/usr/lib64/pkgconfig/../../lib64 which eventually causes link failure: desktop/source/lib/init.cxx:6451: error: undefined reference to 'ublock_getCode_77' Reportedly realpath(1) is available even on macOS now so use it to resolve these paths. Change-Id: I754447ad23982918d6f8e80f839112db22b75205 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189864 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> (cherry picked from commit 457872f8cac849b319ad4f88a94c8390aa9e3df7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189879 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> (cherry picked from commit db867ee5d6b6a239a7d822233ad022d18962ccd4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192407 Tested-by: Thorsten Behrens <[email protected]> Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/configure.ac b/configure.ac index 3eefd30315b9..f7774320d5a5 100644 --- a/configure.ac +++ b/configure.ac @@ -46,11 +46,18 @@ FilterLibs() filteredlibs= for f in $1; do case "$f" in + -L*) + case `realpath "${f#-L}"` in # let's start with Fedora's paths for now - -L/lib|-L/lib/|-L/lib64|-L/lib64/|-L/usr/lib|-L/usr/lib/|-L/usr/lib64|-L/usr/lib64/) + /lib|/lib/|/lib64|/lib64/|/usr/lib|/usr/lib/|/usr/lib64|/usr/lib64/) # ignore it: on UNIXoids it is searched by default anyway # but if it's given explicitly then it may override other paths # (on macOS it would be an error to use it instead of SDK) + ;; + *) + filteredlibs="$filteredlibs $f" + ;; + esac ;; *) filteredlibs="$filteredlibs $f"
