Easter Bunny brings new redland tarballs

upgrade raptor to 2.0.9, rasqal to 0.9.30, redland to 1.0.16:
- new raptor depends on libxml2 version 2.6.27 and thus will _not_
  build against system libxml2 on Mac OS X 10.4/10.5
- stop delivering raptor-config/rasqal-config, set env vars instead
  (which unfortunately requires patching configures, TODO: upstream that)
- remove redundant configure flags
- stop passing -Wl,no-inhibit-exec (causes HP-UX code to be built on Linux)
- disable new rasqal build deps:
    --with-uuid-library=internal --with-digest-library=internal
- disable redland "libltdl" nonsense via --disable-modular
- fortunately openssl digest support has been removed too
- drop raptor-1.4.18.ooo_build.patch, set RAPTOR2_CFLAGS/LIBS instead
- drop raptor-1.4.18.autotools.patch:
  + FreeBSD parts moved to raptor-freebsd.patch.1
  + Android parts obsolete
  + don't know about the MinGW part (TODO)
- from drop raptor-1.4.18.mingw.patch dropped the part defining parsers
  to be built, done via --enable-parsers
- drop redland/raptor/raptor-1.4.18.cross.patch:
  the vsnprintf check is now done at runtime, and expat has been removed
- drop raptor-1.4.18.aix.patch,redland-1.0.8.aix.patch:
  presumably don't need special check for V7BETA since it's released now
- drop raptor-1.4.18.rindex.patch, index/rindex no longer used
- drop raptor-1.4.18.entities.patch, fixed upstream in 2.0.7
- drop raptor-1.4.18.fixes.patch, fixed upstream in 2.0.9
- drop raptor-1.4.18.{libxml,libxslt}.patch: TODO
- drop {raptor-1.4.18,rasqal-0.9.16,redland-1.0.8}.legal.patch:
  we don't care any more about Sun legal dept.
- drop rasqal-0.9.16.ooo_build.patch, set RASQAL_CFLAGS/LIBS instead
- drop rasqal-0.9.16.autotools.patch:
  + FreeBSD parts moved to rasqal-freebsd.patch.1
  + Android parts obsolete
  + MinGW part only for cygwin build
- drop redland-1.0.8.autotools.patch:
  + FreeBSD parts moved to redland-freebsd.patch.1
  + Android parts obsolete
  + don't know about the MinGW part (TODO)
- drop redland-1.0.8.ooo_build.patch,
  hopefully not necessary to disable utils build

Change-Id: I9cc44928ba87392d69e809abe2236cec0e4a508a
Reviewed-on: https://gerrit.libreoffice.org/3154
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

1 files changed, 27 insertions, 21 deletions

diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
index 6b796fca0e88..59c171f236b0 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -22,50 +22,56 @@ $(eval $(call gb_ExternalProject_register_targets,redland,\
 	build \
 ))
 
+# note: this can intentionally only build against internal raptor/rasqal
+
 ifeq ($(OS),WNT)
 $(call gb_ExternalProject_get_state_target,redland,build):
 	$(call gb_ExternalProject_run,build,\
-		PATH="$(OUTDIR)/bin:$$PATH" \
 		CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
 		CPPFLAGS="-I$(OUTDIR)/inc/external" \
 		LDFLAGS="-Wl$(COMMA)--no-undefined -Wl$(COMMA)--enable-runtime-pseudo-reloc-v2 -Wl$(COMMA)--export-all-symbols -L$(OUTDIR)/lib" \
-		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 --disable-gtk-doc --with-openssl-digests \
-			--with-xml-parser=libxml --with-raptor=system --with-rasqal=system \
-			--without-bdb --without-sqlite --without-mysql --without-postgresql \
-			--without-threestore --with-regex-library=posix --with-decimal=none \
-			--with-www=xml --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
+		PKG_CONFIG="" \
+		RAPTOR2_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2  $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
+		RASQAL_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \
+		./configure --disable-static --disable-gtk-doc \
+			--disable-modular \
+			--without-bdb --without-sqlite --without-mysql \
+			--without-postgresql --without-threestore --without-virtuoso \
+			--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
 			lt_cv_cc_dll_switch="-shared" \
-		&& cd librdf \
 		&& $(MAKE) \
 	)
 else
 $(call gb_ExternalProject_get_state_target,redland,build):
 	$(call gb_ExternalProject_run,build,\
 		CFLAGS="$(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden)" \
-		PATH="$(OUTDIR)/bin:$$PATH" \
 		LDFLAGS="-L$(OUTDIR)/lib \
-		$(if $(filter LINUX FREEBSD,$(OS)),-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib" -Wl$(COMMA)-noinhibit-exec) \
+		$(if $(filter LINUX FREEBSD,$(OS)),-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)) \
-		$(if $(filter MACOSX,$(OS)), -Wl$(COMMA)-dylib_file$(COMMA)@loader_path/libraptor-lo.1.dylib:$(OUTDIR)/lib/libraptor-lo.1.dylib \
+		$(if $(filter MACOSX,$(OS)), -Wl$(COMMA)-dylib_file$(COMMA)@loader_path/libraptor-lo.$(RAPTOR_MAJOR).dylib:$(OUTDIR)/lib/libraptor-lo.$(RAPTOR_MAJOR).dylib \
 		$(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)" \
-		./configure --disable-gtk-doc --with-openssl-digests \
-			--with-xml-parser=libxml --with-raptor=system --with-rasqal=system \
-			--without-bdb --without-sqlite --without-mysql --without-postgresql \
-			--without-threestone --with-regex-library=posix --with-decimal=none \
-			--with-www=xml \
+		PKG_CONFIG="" \
+		RAPTOR2_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RAPTOR2_LIBS="-L$(OUTDIR)/lib -lraptor2  $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_LIBS),-lxml2)" \
+		RASQAL_CFLAGS="-I$(OUTDIR)/inc/external" \
+		RASQAL_LIBS="-L$(OUTDIR)/lib -lrasqal" \
+		./configure --disable-gtk-doc \
+			--disable-modular \
+			--without-bdb --without-sqlite --without-mysql \
+			--without-postgresql --without-threestone --without-virtuoso \
 			$(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-out ANDROID,$(OS)),--with-threads) \
-		&& cd librdf \
 		&& $(MAKE) \
-			$(if $(filter MACOSX,$(OS)),&& $(PERL) \
-            $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
-            $(gb_Package_SOURCEDIR_redland)/librdf/.libs/librdf-lo.0.dylib) \
+		$(if $(filter MACOSX,$(OS)),&& $(PERL) \
+			$(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
+			$(gb_Package_SOURCEDIR_redland)/librdf/.libs/librdf-lo.$(RASQAL_MAJOR).dylib) \
 	)
 endif
+
 # vim: set noet sw=4 ts=4: