[REVIEW 3-5, 3-5-1] Make libxslt link the right libxml on mac ppc

Stephan Bergmann sbergman at redhat.com
Tue Feb 28 12:17:16 PST 2012


On 02/28/2012 03:21 PM, Fridrich Strba wrote:
> diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
> index cc89185..d21c0e3 100644
> --- a/libxslt/makefile.mk
> +++ b/libxslt/makefile.mk
> @@ -86,6 +86,11 @@ CONF_ILIB=
>  .ELSE
>  CONF_ILIB=-L$(ILIB:s/;/ -L/)
>  .ENDIF
> +
> +.IF "$(OS)"=="MACOSX" && "$(SYSTEM_LIBXML)" != "YES"
> +LIBXML2LIB=-L$(SOLARLIBDIR) -lxml2
> +.ENDIF
> +

But that is inside an .IF "$(OS)"=="WNT" block, isn't it?  Also, at 
least for my Mac OS X 10.6 x86 tests, the existing libxslt/makefile.mk 
seemed to already work fine with --without-system-libxml (probably due 
to the

> .IF "$(SYSTEM_LIBXML)"!="YES"
> # Use the xml2-config from our own libxml2 copy
> CONFIGURE_FLAGS+=--with-libxml-prefix=$(SOLARVER)/$(INPATH)
> .ENDIF

at line 143).

Stephan


More information about the LibreOffice mailing list