diff options
| author | David Tardon <dtardon@redhat.com> | 2015-08-30 13:23:02 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-08-30 18:19:41 +0200 |
| commit | ee0f5944fb2da2b81217c9d67f617265e9cafb9c (patch) | |
| tree | cf01e73fe537e91be781a97617be22b33606166a /external | |
| parent | 41680ccd058696eb1679c91f11c8d53f12728241 (diff) | |
libmwaw: drop dep. on boost
Change-Id: If3bce409a98b9593920c41f8e18b82e8daa36fb1
Diffstat (limited to 'external')
| -rw-r--r-- | external/libmwaw/ExternalProject_libmwaw.mk | 6 | ||||
| -rw-r--r-- | external/libmwaw/Library_mwaw.mk | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk index 5dbb7723508d..5fa97ca5c649 100644 --- a/external/libmwaw/ExternalProject_libmwaw.mk +++ b/external/libmwaw/ExternalProject_libmwaw.mk @@ -16,7 +16,6 @@ $(eval $(call gb_ExternalProject_register_targets,libmwaw,\ )) $(eval $(call gb_ExternalProject_use_externals,libmwaw,\ - boost_headers \ revenge \ )) @@ -30,15 +29,14 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) : , \ --enable-shared --disable-static \ ) \ + --with-sharedptr=c++11 \ --without-docs \ --disable-tools \ --disable-zip \ $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ --disable-werror \ - CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\ - $(if $(COM_GCC_IS_CLANG),-Qunused-arguments) \ - -I$(call gb_UnpackedTarball_get_dir,boost))" \ + CXXFLAGS="$(CXXFLAGS_CXX11)" \ $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk index f5aeee03d67e..90b766555277 100644 --- a/external/libmwaw/Library_mwaw.mk +++ b/external/libmwaw/Library_mwaw.mk @@ -13,7 +13,6 @@ $(eval $(call gb_Library_use_unpacked,mwaw,libmwaw)) $(eval $(call gb_Library_use_externals,mwaw,\ revenge \ - boost_headers \ )) $(eval $(call gb_Library_set_warnings_not_errors,mwaw)) @@ -24,10 +23,10 @@ $(eval $(call gb_Library_set_include,mwaw,\ )) $(eval $(call gb_Library_add_defs,mwaw,\ - -DBOOST_ALL_NO_LIB \ -DBUILD_MWAW \ -DNDEBUG \ -D_WINDLL \ + -DSHAREDPTR_STD \ )) $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ |