diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-04-01 12:41:18 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-04-03 10:17:08 +0000 |
commit | d719c01c2f112d97b09aee008f9bfee57719eeed (patch) | |
tree | 6e2bb0c78cf3aa1b0561329c8fe4445fb49b5ce9 /redland/ExternalProject_raptor.mk | |
parent | fdo#62525: use cow_wrapper for ViewInformation3D (diff) | |
download | core-d719c01c2f112d97b09aee008f9bfee57719eeed.tar.gz core-d719c01c2f112d97b09aee008f9bfee57719eeed.zip |
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>
Diffstat (limited to 'redland/ExternalProject_raptor.mk')
-rw-r--r-- | redland/ExternalProject_raptor.mk | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk index 48b3c52d64c3..173ce374b2f1 100644 --- a/redland/ExternalProject_raptor.mk +++ b/redland/ExternalProject_raptor.mk @@ -25,10 +25,9 @@ $(call gb_ExternalProject_get_state_target,raptor,build): 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 --with-openssl-digests \ - --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \ - --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore \ - --with-regex-library=posix --with-decimal=none --with-www=xml \ + ./configure --disable-static --enable-shared --disable-gtk-doc \ + --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \ + --with-www=xml \ --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --target=$(HOST_PLATFORM) \ lt_cv_cc_dll_switch="-shared" \ && $(MAKE) \ @@ -40,13 +39,11 @@ $(call gb_ExternalProject_get_state_target,raptor,build): CFLAGS="$(if $(debug),-g,-O) $(if $(filter TRUE,$(DISABLE_DYNLOADING)),-fvisibility=hidden) \ $(if $(filter GCCLINUXPOWERPC64,$(COM)$(OS)$(CPUNAME)),-mminimal-toc)" \ 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)-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))" \ CPPFLAGS="-I$(OUTDIR)/inc/external $(if $(SYSBASE),-I$(SYSBASE)/usr/include)" \ - ./configure --disable-gtk-doc --with-threads --with-openssl-digests \ - --with-xml-parser=libxml --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \ - --without-bdb --without-sqlite --without-mysql --without-postgresql \ - --without-threestone --with-regex-library=posix --with-decimal=none \ + ./configure --disable-gtk-doc \ + --enable-parsers="rdfxml ntriples turtle trig guess rss-tag-soup" \ --with-www=xml \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ @@ -57,4 +54,5 @@ $(call gb_ExternalProject_get_state_target,raptor,build): && $(MAKE) \ ) endif + # vim: set noet sw=4 ts=4: |