[Libreoffice-commits] core.git: external/libxslt

[Douglas Mencken]

 external/libxslt/ExternalProject_xslt.mk |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 9a2fbee575d8f84a2b00a3b89853d977480f40d5
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Fri Dec 18 22:03:43 2015 -0500

    external/libxslt: run macosx-change-install-names.pl for dylib
    
    libxslt shared library depends on libxml2 library, and for cases when
    libxml2 is "external", just-compiled libxslt will have an entry like
    /@.__________________________________________________URELIB/lib/libxml2.2.dylib
    and the whole LibreOffice application will fail to run
    
    Change-Id: Ifafbdab74151207597ba9bd2e3beb0b8c3aa3ab7
    Reviewed-on: https://gerrit.libreoffice.org/20816
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/libxslt/ExternalProject_xslt.mk b/external/libxslt/ExternalProject_xslt.mk
index 9b4632e..8da20a1 100644
--- a/external/libxslt/ExternalProject_xslt.mk
+++ b/external/libxslt/ExternalProject_xslt.mk
@@ -53,6 +53,10 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
 			$(if $(SYSTEM_LIBXML),,--with-libxml-src=$(call gb_UnpackedTarball_get_dir,xml2)) \
 		&& chmod 777 xslt-config \
 		&& $(MAKE) \
+		$(if $(filter MACOSX,$(OS)),\
+			&& $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
+				$(gb_Package_SOURCEDIR_xslt)/libxslt/.libs/libxslt.1.dylib \
+		) \
 	)
 endif