diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2016-03-05 20:09:34 -0500 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2016-03-08 04:43:24 +0000 |
| commit | b325b4c286b56a63316063a3ac4648bf7b7efcbe (patch) | |
| tree | 3084a96548350c38c0d910670c9c512c5ea6e30f /external/liborcus/ExternalProject_liborcus.mk | |
| parent | a420a4346ec21ea561f1321767d6a5eed98df02b (diff) | |
Update liborcus to 0.11.0.
Markus did half of this, and I simply carried the torch.
Change-Id: Icd3ee1e4b5bd562faee06dfd9dce52a4bed49a71
Reviewed-on: https://gerrit.libreoffice.org/22943
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'external/liborcus/ExternalProject_liborcus.mk')
| -rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 7eb8fdb44c2d..580ef847a5b6 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -13,6 +13,7 @@ $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build)) $(eval $(call gb_ExternalProject_use_externals,liborcus, \ boost_headers \ + boost_filesystem \ boost_iostreams \ boost_system \ mdds_headers \ @@ -38,9 +39,9 @@ ifneq ($(SYSTEM_ZLIB),) liborcus_LIBS+=-lz endif ifneq ($(SYSTEM_BOOST),) -liborcus_LIBS+=$(BOOST_SYSTEM_LIB) $(BOOST_IOSTREAMS_LIB) +liborcus_LIBS+=$(BOOST_SYSTEM_LIB) $(BOOST_IOSTREAMS_LIB) $(BOOST_FILESYSTEM_LIB) else -liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboost_system -lboost_iostreams +liborcus_LIBS+=-L$(gb_StaticLibrary_WORKDIR) -lboost_system -lboost_iostreams -lboost_filesystem endif ifeq ($(OS),ANDROID) liborcus_LIBS+=-lgnustl_shared -lm @@ -96,12 +97,13 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : , \ --enable-shared --disable-static \ ) \ - $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ - --disable-spreadsheet-model \ - --without-tools \ - --disable-werror \ - $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ - $(if $(SYSTEM_BOOST),,\ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ + --disable-spreadsheet-model \ + --without-tools \ + --disable-python \ + --disable-werror \ + $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ + $(if $(SYSTEM_BOOST),,\ --with-boost=$(WORKDIR)/UnpackedTarball/boost \ boost_cv_lib_iostreams=yes \ boost_cv_lib_system=yes \ @@ -111,8 +113,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : $(MAKE) \ $(if $(filter MACOSX,$(OS)),\ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ - $(gb_Package_SOURCEDIR_liborcus)/src/liborcus/.libs/liborcus-0.10.0.dylib \ - $(gb_Package_SOURCEDIR_liborcus)/src/parser/.libs/liborcus-parser-0.10.0.dylib \ + $(gb_Package_SOURCEDIR_liborcus)/src/liborcus/.libs/liborcus-0.11.0.dylib \ + $(gb_Package_SOURCEDIR_liborcus)/src/parser/.libs/liborcus-parser-0.11.0.dylib \ ) \ ) |