diff options
| author | David Tardon <dtardon@redhat.com> | 2015-08-30 12:33:57 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-08-30 18:19:38 +0200 |
| commit | 41680ccd058696eb1679c91f11c8d53f12728241 (patch) | |
| tree | 2bada9794d211b716bc1d6ac9af09a65426a08fb /external/libwps/ExternalProject_libwps.mk | |
| parent | Mark rsc comments as translated (diff) | |
| download | core-41680ccd058696eb1679c91f11c8d53f12728241.tar.gz core-41680ccd058696eb1679c91f11c8d53f12728241.zip | |
libwps: drop dep. on boost
Change-Id: Id8ac510ad96d2a845b5c14024973274fb797c000
Diffstat (limited to 'external/libwps/ExternalProject_libwps.mk')
| -rw-r--r-- | external/libwps/ExternalProject_libwps.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk index 475f56a42d64..0bb5ddee78a0 100644 --- a/external/libwps/ExternalProject_libwps.mk +++ b/external/libwps/ExternalProject_libwps.mk @@ -16,7 +16,6 @@ $(eval $(call gb_ExternalProject_register_targets,libwps,\ )) $(eval $(call gb_ExternalProject_use_externals,libwps,\ - boost_headers \ revenge \ )) @@ -30,12 +29,13 @@ $(call gb_ExternalProject_get_state_target,libwps,build) : , \ --enable-shared --disable-static \ ) \ + --with-sharedptr=c++11 \ --without-docs \ --disable-tools \ --disable-debug \ --disable-werror \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ - CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \ + CXXFLAGS="$(CXXFLAGS_CXX11) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \ $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ |