diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-04 14:39:18 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-04 16:58:26 +0000 |
| commit | 29215619ed91c1d066b8e6e715f0c020bf7892f7 (patch) | |
| tree | 035cd8249b7e377936119b47cdf762e21f75d9dc /m4 | |
| parent | f9334da94ff8d6442865aa7f388fe1294d4b407e (diff) | |
configure: filter -L/usr/lib etc. out of *_LIBS
The goal is to avoid build breakage by pkg-config or whatever helpfully
putting default paths like -L/usr/lib64 into *_LIBS, which is entirely
useless since ld searches there anyway but may override other -L that
occur later on the command line for LO bundled externals.
On a Fedora 22 system, at least these variales were affected:
CLUCENE_LIBS FIREBIRD_LIBS KDE4_LIBS POSTGRESQL_LIB BOOST_LDFLAGS
Change-Id: Ie55f65c3ae29a125f16871d95ad8b716abf5c982
Reviewed-on: https://gerrit.libreoffice.org/19784
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/libo_externals.m4 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4 index 3fe9fce18648..f755358bb395 100644 --- a/m4/libo_externals.m4 +++ b/m4/libo_externals.m4 @@ -17,6 +17,8 @@ if test "$with_system_$1" = "yes"; then SYSTEM_$2=TRUE PKG_CHECK_MODULES([$2], [$3]) $2_CFLAGS=$(printf '%s' "${$2_CFLAGS}" | sed -e "s/-I/${ISYSTEM?}/g") + FilterLibs "${$2_LIBS}" + $2_LIBS="$filteredlibs" else AC_MSG_RESULT([internal]) SYSTEM_$2= |