diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-01-08 13:17:28 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-03 17:53:57 +0100 |
| commit | 36788e95fdbe96ac27c71197fdbfee178b53f52c (patch) | |
| tree | 31c45984896a72ee3c1aaaeca2a5ba0d1ad06104 /external/liborcus | |
| parent | 0035b3218d8652652e62afe89eddfd28a9021b75 (diff) | |
upgrade liborcus
Conflicts:
external/boost/StaticLibrary_boost_system.mk
Change-Id: Ie4af26c87a100b67baeedbaa7fb1ac428845f92b
Diffstat (limited to 'external/liborcus')
| -rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk | 13 | ||||
| -rw-r--r-- | external/liborcus/UnpackedTarball_liborcus.mk | 5 |
2 files changed, 10 insertions, 8 deletions
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 1268a0d37335..e12ebd2d09f5 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -13,7 +13,9 @@ $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build)) $(eval $(call gb_ExternalProject_use_externals,liborcus, \ boost_headers \ - boostsystem \ + boost_iostreams \ + boost_system \ + mdds_headers \ zlib \ )) @@ -36,9 +38,9 @@ ifneq ($(SYSTEM_ZLIB),) liborcus_LIBS+=-lz endif ifneq ($(SYSTEM_BOOST),) -liborcus_LIBS+=$(BOOST_SYSTEM_LIB) +liborcus_LIBS+=$(BOOST_SYSTEM_LIB) $(BOOST_IOSTREAMS_LIB) else -liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboostsystem +liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboost_system -lboost_iostreams endif ifeq ($(OS),ANDROID) liborcus_LIBS+=-lgnustl_shared -lm @@ -88,15 +90,18 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : $(if $(liborcus_CXXFLAGS),CXXFLAGS='$(liborcus_CXXFLAGS)') \ $(if $(liborcus_CPPFLAGS),CPPFLAGS='$(liborcus_CPPFLAGS)') \ $(if $(liborcus_LDFLAGS),LDFLAGS='$(liborcus_LDFLAGS)') \ + MDDS_CFLAGS='$(MDDS_CFLAGS)' \ + MDDS_LIBS=' ' \ ./configure \ --with-pic \ --enable-static \ --disable-shared \ $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug,--disable-debug) \ --disable-spreadsheet-model \ + --without-tools \ --disable-werror \ + $(if $(SYSTEM_BOOST),,--with-boost=$(WORKDIR)/UnpackedTarball/boost) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(SYSTEM_BOOST),,--with-boost-system=boostsystem) \ && $(if $(VERBOSE)$(verbose),V=1) \ $(MAKE) \ ) diff --git a/external/liborcus/UnpackedTarball_liborcus.mk b/external/liborcus/UnpackedTarball_liborcus.mk index 930543c9b664..d046f80f4743 100644 --- a/external/liborcus/UnpackedTarball_liborcus.mk +++ b/external/liborcus/UnpackedTarball_liborcus.mk @@ -16,14 +16,11 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,liborcus,0)) liborcus_patches := # make config.sub recognize arm-linux-androideabi -liborcus_patches += liborcus_0.1.0-configure.patch +# liborcus_patches += liborcus_0.1.0-configure.patch # don't use dllimport liborcus_patches += liborcus_0.1.0-dllimport.patch -# fdo#63844 -liborcus_patches += liborcus-handle-invalid-xml.patch.1 - ifeq ($(OS),MACOSX) # no "tac" command on OS X, but "tail -r" liborcus_patches += liborcus_0.1.0-tac.patch |