d719c01c2f
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>
30 lines
1.6 KiB
Makefile
30 lines
1.6 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_ExternalPackage_ExternalPackage,redland,redland))
|
|
|
|
$(eval $(call gb_ExternalPackage_use_external_project,redland,redland))
|
|
|
|
ifeq ($(OS),MACOSX)
|
|
$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf-lo.$(REDLAND_MAJOR).dylib,src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib))
|
|
$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.dylib,src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib))
|
|
else ifneq ($(filter IOS ANDROID,$(OS)),)
|
|
$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,src/.libs/librdf.a))
|
|
else ifneq ($(filter WNTGCC,$(OS)$(COM)),)
|
|
$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.dll.a,src/.libs/librdf.dll.a))
|
|
$(eval $(call gb_ExternalPackage_add_file,redland,bin/librdf-$(REDLAND_MAJOR).dll,src/.libs/librdf-$(REDLAND_MAJOR).dll))
|
|
else ifneq ($(filter WNT,$(OS)),)
|
|
$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.a,src/.libs/librdf.a))
|
|
$(eval $(call gb_ExternalPackage_add_file,redland,bin/librdf.dll,src/.libs/librdf.dll))
|
|
else
|
|
$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf-lo.so.$(REDLAND_MAJOR),src/.libs/librdf-lo.so.$(REDLAND_MAJOR).0.0))
|
|
$(eval $(call gb_ExternalPackage_add_file,redland,lib/librdf.so,src/.libs/librdf-lo.so.$(REDLAND_MAJOR).0.0))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|