diff options
| author | David Tardon <dtardon@redhat.com> | 2015-08-30 13:24:55 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-08-30 18:19:44 +0200 |
| commit | 6ac4772ecc038c3e041a8b9bb594c53d977ac0f2 (patch) | |
| tree | 9660c4b72f1b4f72d9b74b6da20381a9cd0b527c /external/libodfgen | |
| parent | libmwaw: drop dep. on boost (diff) | |
| download | core-6ac4772ecc038c3e041a8b9bb594c53d977ac0f2.tar.gz core-6ac4772ecc038c3e041a8b9bb594c53d977ac0f2.zip | |
libodfgen: drop dep. on boost
Change-Id: If13cdf90de752626bbd37877fea045faae0616cb
Diffstat (limited to 'external/libodfgen')
| -rw-r--r-- | external/libodfgen/ExternalProject_libodfgen.mk | 4 | ||||
| -rw-r--r-- | external/libodfgen/Library_odfgen.mk | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk index b60d40662218..4f5ca4ee75dd 100644 --- a/external/libodfgen/ExternalProject_libodfgen.mk +++ b/external/libodfgen/ExternalProject_libodfgen.mk @@ -16,7 +16,6 @@ $(eval $(call gb_ExternalProject_register_targets,libodfgen,\ )) $(eval $(call gb_ExternalProject_use_externals,libodfgen,\ - boost_headers \ revenge \ )) @@ -34,8 +33,9 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) : --disable-werror \ --disable-weffc \ --without-docs \ + --with-sharedptr=c++11 \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ - CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) $(if $(SYSTEM_REVENGE),,$(if $(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \ + CXXFLAGS="$(CXXFLAGS_CXX11) $(if $(SYSTEM_REVENGE),,$(if $(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \ $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ diff --git a/external/libodfgen/Library_odfgen.mk b/external/libodfgen/Library_odfgen.mk index 4cae5b01601c..669d55190c09 100644 --- a/external/libodfgen/Library_odfgen.mk +++ b/external/libodfgen/Library_odfgen.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,odfgen)) $(eval $(call gb_Library_use_unpacked,odfgen,libodfgen)) $(eval $(call gb_Library_use_externals,odfgen,\ - boost_headers \ revenge \ )) @@ -24,10 +23,10 @@ $(eval $(call gb_Library_set_include,odfgen,\ )) $(eval $(call gb_Library_add_defs,odfgen,\ - -DBOOST_ALL_NO_LIB \ -DDLL_EXPORT \ -DLIBODFGEN_BUILD \ -DNDEBUG \ + -DSHAREDPTR_STD \ -DPACKAGE=\"libodfgen\" \ -DVERSION=\"0.1.$(ODFGEN_VERSION_MICRO)\" \ )) |