diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-08-07 12:24:09 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-08-07 13:14:05 +0200 |
| commit | 1067c32964e4e0754d2d926e1319b4060ded93f5 (patch) | |
| tree | 2d8e4693be2abc2720f69312958be7de8761cf92 | |
| parent | 551552f18f4319e23f604e0b17ecaf0a534494e1 (diff) | |
redland/raptor: use system xml2-config only on MacOSX
On Fedora 30, we get:
instdir/program/libraptor2-lo.so.0 has suspicious NEEDED: liblzma.so.5
Because:
> xml2-config --libs
-lxml2 -lz -llzma -lm -ldl
However:
> pkg-config --libs libxml-2.0
-lxml2
So prefer pkg-config for system libxml2, except on MacOSX, where
people claim that pkg-config leads to disaster.
Change-Id: I29ffd2ced769d7111c4de17de53082db2e2ba326
Reviewed-on: https://gerrit.libreoffice.org/77093
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
| -rw-r--r-- | external/redland/ExternalProject_raptor.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/redland/ExternalProject_raptor.mk b/external/redland/ExternalProject_raptor.mk index 3277f8797460..4309df17b246 100644 --- a/external/redland/ExternalProject_raptor.mk +++ b/external/redland/ExternalProject_raptor.mk @@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build): , \ --enable-shared --disable-static \ ) \ - $(if $(SYSTEM_LIBXML),,--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \ + $(if $(SYSTEM_LIBXML),$(if $(filter-out MACOSX,$(OS)),--without-xml2-config),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,libxml2)/xml2-config) \ && $(MAKE) \ ) |