[Libreoffice-commits] core.git: 5 commits - libxml2/libxml2-configure.patch libxslt/ExternalProject_xslt.mk libxslt/libxslt-configure.patch redland/ExternalPackage_raptor.mk redland/ExternalPackage_rasqal.mk redland/ExternalProject_raptor.mk redland/ExternalProject_rasqal.mk redland/ExternalProject_redland.mk redland/Module_redland.mk
Michael Stahl
mstahl at redhat.com
Wed Apr 3 05:53:40 PDT 2013
libxml2/libxml2-configure.patch | 2 +-
libxslt/ExternalProject_xslt.mk | 2 +-
libxslt/libxslt-configure.patch | 2 +-
redland/ExternalPackage_raptor.mk | 3 ---
redland/ExternalPackage_rasqal.mk | 2 --
redland/ExternalProject_raptor.mk | 9 ++++-----
redland/ExternalProject_rasqal.mk | 9 ++++-----
redland/ExternalProject_redland.mk | 10 ++++------
redland/Module_redland.mk | 2 +-
9 files changed, 16 insertions(+), 25 deletions(-)
New commits:
commit 66c028fa4c5c3a7c9756c61130d0506e01b58d23
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Apr 3 14:41:25 2013 +0200
redland: clean up libxml2 usage
- use xml2-config from unpacked dir
- rasqal does use libxml2 apparently for utils
- redland itself does not use libxml2 directly
- no need to put OUTDIR/bin on PATH
Change-Id: Ib4481c681d0b188c06217f7bc0d000f15ab82da3
diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk
index f5fc5df..b35578d 100644
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -29,6 +29,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
--without-xslt-config \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \
lt_cv_cc_dll_switch="-shared" \
+ $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
&& $(MAKE) \
)
else
@@ -48,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
- $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(OUTDIR)/bin/xml2-config) \
+ $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
&& $(MAKE) \
)
endif
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
index b82e4c1..10ff5f3 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -37,13 +37,13 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
--with-digest-library=internal \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
lt_cv_cc_dll_switch="-shared" \
+ $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
&& $(MAKE) \
)
else
$(call gb_ExternalProject_get_state_target,rasqal,build):
$(call gb_ExternalProject_run,build,\
CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
- PATH="$(OUTDIR)/bin:$$PATH" \
LDFLAGS=" \
$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-rpath-link$(COMMA)$(OUTDIR)/lib -Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib") \
$(if $(SYSBASE),$(if $(filter LINUX SOLARIS,$(OS)),-L$(SYSBASE)/lib -L$(SYSBASE)/usr/lib -lpthread -ldl)) \
@@ -60,6 +60,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
+ $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
index e75d11f..530295a 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -11,8 +11,6 @@ $(eval $(call gb_ExternalProject_ExternalProject,redland))
$(eval $(call gb_ExternalProject_use_unpacked,redland,redland))
-$(eval $(call gb_ExternalProject_use_external,redland,libxml2))
-
$(eval $(call gb_ExternalProject_use_packages,redland, \
raptor \
rasqal \
commit 6848b33c9fdcc67e842627e1da588031a63b88ee
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Apr 3 14:26:25 2013 +0200
redland: we don't need the raptor features using libxslt
Change-Id: I6288e7550a10be072ad1665bd03a8e6499bc4033
diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk
index f522f56..f5fc5df 100644
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -26,6 +26,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
./configure --disable-static --enable-shared --disable-gtk-doc \
--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
--with-www=xml \
+ --without-xslt-config \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \
lt_cv_cc_dll_switch="-shared" \
&& $(MAKE) \
@@ -43,10 +44,10 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
./configure --disable-gtk-doc \
--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
--with-www=xml \
+ --without-xslt-config \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
- $(if $(filter NO,$(SYSTEM_LIBXSLT)),--with-xslt-config=$(OUTDIR)/bin/xslt-config) \
$(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(OUTDIR)/bin/xml2-config) \
&& $(MAKE) \
)
commit 2745cca129a255030fcc468ac60f0e48d04c9313
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Apr 3 14:18:18 2013 +0200
libxslt: remove usage of dmake remnant XSLTLIB
Change-Id: Idb5dc8d0036b99a71cd8c1c0e740939074cc1a48
diff --git a/libxslt/libxslt-configure.patch b/libxslt/libxslt-configure.patch
index 003cd2c..6b189df 100644
--- a/libxslt/libxslt-configure.patch
+++ b/libxslt/libxslt-configure.patch
@@ -73,7 +73,7 @@
-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
+#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
-+the_libs="-L${libdir} ${XSLTLIB} -lm"
++the_libs="-L${libdir} -lxslt -lm"
if test "$includedir" != "/usr/include"; then
the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
else
diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk
index 058da49..f522f56 100644
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -22,7 +22,6 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
$(call gb_ExternalProject_run,build,\
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L,$(ILIB))" \
- XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
./configure --disable-static --enable-shared --disable-gtk-doc \
--enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
index d722100..b82e4c1 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -26,7 +26,6 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
$(call gb_ExternalProject_run,build,\
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L$,$(ILIB))" \
- XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
PKG_CONFIG="" \
RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
commit fc1eaf33e01872cab3c9cdc534de12b32d028899
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Apr 3 14:15:37 2013 +0200
libxml2: remove usage of dmake remnant LIBXML2LIB
Change-Id: I8a4f298af99f3415b0ef7a3fc5d69642b5b71f62
diff --git a/libxml2/libxml2-configure.patch b/libxml2/libxml2-configure.patch
index 125f6c0..d851501 100644
--- a/libxml2/libxml2-configure.patch
+++ b/libxml2/libxml2-configure.patch
@@ -129,7 +129,7 @@
- else
- echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@
- fi
-+ echo -L${libdir} ${LIBXML2LIB} -lm
++ echo -L${libdir} -lxml2 -lm
+# if [ "`uname`" = "Linux" ]
+# then
+# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
diff --git a/libxslt/ExternalProject_xslt.mk b/libxslt/ExternalProject_xslt.mk
index 15247df..357ae78 100644
--- a/libxslt/ExternalProject_xslt.mk
+++ b/libxslt/ExternalProject_xslt.mk
@@ -49,7 +49,7 @@ $(call gb_ExternalProject_get_state_target,xslt,build):
$(if $(filter TRUE,$(DISABLE_DYNLOADING)), \
$(if $(filter IOS,$(OS)),LIBS="-liconv") \
--disable-shared,--disable-static) \
- $(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-prefix=$(OUTDIR) LIBXML2LIB=-lxml2) \
+ $(if $(filter NO,$(SYSTEM_LIBXML)),--with-libxml-prefix=$(OUTDIR)) \
&& chmod 777 xslt-config \
&& $(MAKE) \
)
diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk
index 173ce37..058da49 100644
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -22,7 +22,6 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
$(call gb_ExternalProject_run,build,\
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L,$(ILIB))" \
- LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
./configure --disable-static --enable-shared --disable-gtk-doc \
@@ -49,8 +48,7 @@ $(call gb_ExternalProject_get_state_target,raptor,build):
$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
$(if $(filter NO,$(SYSTEM_LIBXSLT)),--with-xslt-config=$(OUTDIR)/bin/xslt-config) \
- $(if $(filter NO,$(SYSTEM_LIBXML)), \
- LIBXML2LIB=-lxml2 --with-xml2-config=$(OUTDIR)/bin/xml2-config) \
+ $(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(OUTDIR)/bin/xml2-config) \
&& $(MAKE) \
)
endif
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
index 7576b05..d722100 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -26,7 +26,6 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
$(call gb_ExternalProject_run,build,\
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols $(subst ;, -L$,$(ILIB))" \
- LIBXML2LIB="$(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
PKG_CONFIG="" \
commit 7be158cd53aa7d05a903f566d6148dbfae6e3fbb
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Apr 3 13:14:37 2013 +0200
redland: stop delivering headers
Change-Id: I6233b68d795660b1dfe1435f06c31f754efbe7f5
diff --git a/redland/ExternalPackage_raptor.mk b/redland/ExternalPackage_raptor.mk
index a80e69e..2004173 100644
--- a/redland/ExternalPackage_raptor.mk
+++ b/redland/ExternalPackage_raptor.mk
@@ -27,7 +27,4 @@ $(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2-lo.so.$(RAPTOR_M
$(eval $(call gb_ExternalPackage_add_file,raptor,lib/libraptor2.so,src/.libs/libraptor2-lo.so.$(RAPTOR_MAJOR).0.0))
endif
-$(eval $(call gb_ExternalPackage_add_file,raptor,inc/external/raptor2.h,src/raptor2.h))
-$(eval $(call gb_ExternalPackage_add_file,raptor,inc/external/raptor.h,src/raptor.h))
-
# vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalPackage_rasqal.mk b/redland/ExternalPackage_rasqal.mk
index 96280b3..8a09bf1 100644
--- a/redland/ExternalPackage_rasqal.mk
+++ b/redland/ExternalPackage_rasqal.mk
@@ -27,6 +27,4 @@ $(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal-lo.so.$(RASQAL_MA
$(eval $(call gb_ExternalPackage_add_file,rasqal,lib/librasqal.so,src/.libs/librasqal-lo.so.$(RASQAL_MAJOR).0.0))
endif
-$(eval $(call gb_ExternalPackage_add_file,rasqal,inc/external/rasqal.h,src/rasqal.h))
-
# vim: set noet sw=4 ts=4:
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
index 2f550e2..7576b05 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
XSLTLIB="$(if $(filter YES,$(SYSTEM_LIBXSLT)),$(LIBXSLT_LIBS),-lxslt)" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
PKG_CONFIG="" \
- RAPTOR2_CFLAGS="-I$(OUTDIR)/inc/external" \
+ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2" \
./configure --disable-static --enable-shared --disable-gtk-doc \
--disable-pcre \
@@ -52,7 +52,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
$(if $(filter MACOSXNO,$(OS)$(SYSTEM_LIBXML)),-Wl$(COMMA)-dylib_file$(COMMA)@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib)" \
$(if $(SYSBASE),CPPFLAGS="-I$(SYSBASE)/usr/include") \
PKG_CONFIG="" \
- RAPTOR2_CFLAGS="-I$(OUTDIR)/inc/external" \
+ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2" \
./configure --disable-gtk-doc \
--with-regex-library=posix \
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
index 59c171f..e75d11f 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -32,9 +32,9 @@ $(call gb_ExternalProject_get_state_target,redland,build):
LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols -L$(OUTDIR)/lib" \
OBJDUMP="$(HOST_PLATFORM)-objdump" \
PKG_CONFIG="" \
- RAPTOR2_CFLAGS="-I$(OUTDIR)/inc/external" \
+ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
- RASQAL_CFLAGS="-I$(OUTDIR)/inc/external" \
+ RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \
RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \
./configure --disable-static --disable-gtk-doc \
--disable-modular \
@@ -55,9 +55,9 @@ $(call gb_ExternalProject_get_state_target,redland,build):
$(if $(filter NO,$(SYSTEM_LIBXML)),-Wl$(COMMA)-dylib_file$(COMMA)@loader_path/../ure-link/lib/libxml2.2.dylib:$(OUTDIR)/lib/libxml2.2.dylib))" \
CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \
PKG_CONFIG="" \
- RAPTOR2_CFLAGS="-I$(OUTDIR)/inc/external" \
+ RAPTOR2_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,raptor)/src" \
RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2 $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
- RASQAL_CFLAGS="-I$(OUTDIR)/inc/external" \
+ RASQAL_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,rasqal)/src" \
RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \
./configure --disable-gtk-doc \
--disable-modular \
diff --git a/redland/Module_redland.mk b/redland/Module_redland.mk
index 5b1f2a1..431a66d 100644
--- a/redland/Module_redland.mk
+++ b/redland/Module_redland.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Module_add_targets,redland,\
Library_raptor \
Library_rasqal \
Library_rdf \
-))
+))
else
$(eval $(call gb_Module_add_targets,redland,\
ExternalPackage_raptor \
More information about the Libreoffice-commits
mailing list