diff options
Diffstat (limited to 'external/liborcus/ExternalProject_liborcus.mk')
| -rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 3a51917c0a0c..7f2e5f24083f 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -47,7 +47,7 @@ ifeq ($(OS),ANDROID) liborcus_LIBS+=$(gb_STDLIBS) endif -liborcus_CPPCLAGS=$(CPPFLAGS) +liborcus_CPPFLAGS=$(CPPFLAGS) ifeq ($(SYSTEM_ZLIB),) liborcus_CPPFLAGS+=$(ZLIB_CFLAGS) endif @@ -62,6 +62,8 @@ liborcus_CPPFLAGS+=$(gb_COMPILERDEFS_STDLIB_DEBUG) liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11) -DBOOST_SYSTEM_NO_DEPRECATED liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS) +liborcus_CXXFLAGS+=$(call gb_ExternalProject_get_build_flags,liborcus) +liborcus_LDFLAGS+=$(call gb_ExternalProject_get_link_flags,liborcus) ifeq ($(COM),MSC) liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS) endif @@ -78,14 +80,6 @@ ifeq ($(OS),LINUX) liborcus_LDFLAGS+=-Wl,-z,origin -Wl,-rpath,\$$$$ORIGIN endif -ifeq ($(ENABLE_GDB_INDEX),TRUE) -liborcus_LDFLAGS+=-Wl,--gdb-index -liborcus_CXXFLAGS+=-ggnu-pubnames -ifneq ($(USE_LD),) -liborcus_LDFLAGS += $(USE_LD) -endif -endif - $(call gb_ExternalProject_get_state_target,liborcus,build) : $(call gb_Trace_StartRange,liborcus,EXTERNAL) $(call gb_ExternalProject_run,build,\ @@ -105,6 +99,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ --disable-spreadsheet-model \ --without-tools \ + --without-benchmark \ + --without-doc-example \ --disable-python \ --disable-werror \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ @@ -114,13 +110,13 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : boost_cv_lib_system=yes \ boost_cv_lib_filesystem=yes \ ) \ - $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ + $(gb_CONFIGURE_PLATFORMS) \ && $(if $(verbose),V=1) \ $(MAKE) \ $(if $(filter MACOSX,$(OS)),\ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ - $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.17.0.dylib \ - $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.17.0.dylib \ + $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.18.0.dylib \ + $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.18.0.dylib \ ) \ ) $(call gb_Trace_EndRange,liborcus,EXTERNAL) |