Date: prev next · Thread: first prev next last
2012 Archives by date, by thread · List index


Please review these three patches that are needed currently for the
build of 3.5.1-rc1 with internal libxml on MacOSX 10.4 PPC

Cheers

F.
From 9a36bae8ff7fcf3ee901b6b7b0c3198914ae2c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Sun, 26 Feb 2012 00:02:28 +0100
Subject: [PATCH 1/3] Fix libcroco build against internal libxml2

---
 libcroco/makefile.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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) \
-- 
1.7.3.1

From cd437fd8831032d47a1cf3794e3b19e08f7b94fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Mon, 27 Feb 2012 09:24:42 +0100
Subject: [PATCH 2/3] Make librsvg link with internal libxml

---
 librsvg/makefile.mk |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

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,@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)"
 
-- 
1.7.3.1

From e1a72a4454b64b5139c7f1f3b9e2a945dbce1293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Mon, 27 Feb 2012 10:52:50 +0100
Subject: [PATCH 3/3] Make redland build on Mac with internal libxml

---
 redland/rasqal/makefile.mk  |    4 ++++
 redland/redland/makefile.mk |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

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,@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,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.1.dylib
+.IF "$(SYSTEM_LIBXML)" != "YES"
+LDFLAGS+:=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib
+.ENDIF
+
 .ENDIF
 
 CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS)
-- 
1.7.3.1


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.