[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - 3 commits - libcroco/makefile.mk librsvg/makefile.mk redland/rasqal redland/redland

[Stephan Bergmann]

 libcroco/makefile.mk        |    2 +-
 librsvg/makefile.mk         |   16 +++++++++++++---
 redland/rasqal/makefile.mk  |    4 ++++
 redland/redland/makefile.mk |    4 ++++
 4 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit d87bbaf9bccc25b189ff11d8231ca210c69ce738
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Feb 27 10:52:50 2012 +0100

    Make redland build on Mac with internal libxml
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>
    (cherry picked from commit bc09b5b62f1eac7a59340d549a5670d732b9a47c)
    
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 71bee48..7a37759 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -113,6 +113,10 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
 .ENDIF
 .ENDIF			# "$(SYSBASE)"!=""
 
+.IF "$(OS)"=="MACOSX" && "$(SYSTEM_LIBXML)" != "YES"
+LDFLAGS+:=-Wl,-dylib_file, at loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib
+.ENDIF
+
 CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS)
 LDFLAGS+:=$(EXTRA_LINKFLAGS)
 XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 6113531..1268cbe 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -115,6 +115,10 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
 
 .IF "$(OS)"=="MACOSX"
 LDFLAGS+:=-Wl,-dylib_file, at loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.1.dylib
+.IF "$(SYSTEM_LIBXML)" != "YES"
+LDFLAGS+:=-Wl,-dylib_file, at loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib
+.ENDIF
+
 .ENDIF
 
 CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS)
commit a44ee7caef5a1a5965e01ed598706e904dfc2253
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Feb 27 09:24:42 2012 +0100

    Make librsvg link with internal libxml
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>
    (cherry picked from commit 1ec7e749a39a39c6fb172232ca4c6a18dc8a0f4e)
    
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk
index 63f45e3..0ffbdee 100755
--- a/librsvg/makefile.mk
+++ b/librsvg/makefile.mk
@@ -57,14 +57,24 @@ PATCH_FILES=librsvg-2.32.1.patch
 LIBXML_LIBS=-lxml2
 .ENDIF
 
+.IF "$(SYSTEM_LIBXML)" == "YES"
+my_libxml2_cflags=$(LIBXML_CFLAGS)
+my_libxml2_libs=$(LIBXML_LIBS)
+my_dylib_file=
+.ELSE
+my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml
+my_libxml2_libs=-L$(SOLARLIBDIR) -lxml2
+my_dylib_file="-Wl,-dylib_file, at loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib"
+.ENDIF
+
 CONFIGURE_LDFLAGS=-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL))
 CONFIGURE_DIR=
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure \
                  --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC)
 CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \
                  --disable-pixbuf-loader --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \
-                 LIBRSVG_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(LIBXML_CFLAGS)" \
-                 LIBRSVG_LIBS="-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(LIBXML_LIBS) -lcairo -lintl" \
+                 LIBRSVG_CFLAGS="-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(my_libxml2_cflags)" \
+                 LIBRSVG_LIBS="-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(my_libxml2_libs) -lcairo -lintl" \
                  GDK_PIXBUF_CFLAGS="-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0" \
                  GDK_PIXBUF_LIBS=-lgdk_pixbuf-2.0 \
                  GTHREAD_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 \
@@ -72,7 +82,7 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \
                  LIBCROCO_CFLAGS="-I$(SOLARINCDIR)/external/libcroco-0.6" \
                  LIBCROCO_LIBS=-lcroco-0.6 \
                  CFLAGS="$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo" \
-                 LDFLAGS="$(CONFIGURE_LDFLAGS)"
+                 LDFLAGS="$(CONFIGURE_LDFLAGS) $(my_dylib_file)"
 
 CONFIGURE_FLAGS+= CPPFLAGS="$(ARCH_FLAGS) $(EXTRA_CDEFS)"
 
commit 85a5fb3d2138def25832b9921a8200d168301447
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sun Feb 26 00:02:28 2012 +0100

    Fix libcroco build against internal libxml2
    
    Signed-off-by: Petr Mladek <pmladek at suse.cz>
    (cherry picked from commit b248c3f96b0871779fb01056985413c0372cbcd9)
    
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk
index 28c588b..8855f8d 100644
--- a/libcroco/makefile.mk
+++ b/libcroco/makefile.mk
@@ -55,7 +55,7 @@ CONFIGURE_DIR=
 my_libxml2_cflags=$(LIBXML_CFLAGS)
 my_libxml2_libs=$(LIBXML_LIBS)
 .ELSE
-my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml
+my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml -DCROCO_HAVE_LIBXML2=1
 my_libxml2_libs=-L$(SOLARLIBDIR) -lxml2
 .ENDIF
 CONFIGURE_ACTION=./configure --prefix=$(SRC_ROOT)/$(PRJNAME)/$(MISC) \