external/redland/ExternalProject_raptor.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 1067c32964e4e0754d2d926e1319b4060ded93f5 Author: Michael Stahl <[email protected]> AuthorDate: Wed Aug 7 12:24:09 2019 +0200 Commit: Michael Stahl <[email protected]> CommitDate: Wed Aug 7 13:14:05 2019 +0200 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 <[email protected]> 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) \ ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
