diff options
| author | David Tardon <dtardon@redhat.com> | 2018-01-02 13:40:57 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2018-01-02 16:58:13 +0100 |
| commit | a3488acbeb3b618cf5b6b1a93608c58d0eb9d646 (patch) | |
| tree | 00eef2aef08ebab02ea6c53c39874fb4e16427eb /external | |
| parent | 269f12c8e8c9d43f0b84a40405eed53daef72cfe (diff) | |
upload libmspub 0.1.3
Change-Id: I1f759bf914e4a61fc943098f04661789d374ffdb
Reviewed-on: https://gerrit.libreoffice.org/47256
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libmspub/ExternalProject_libmspub.mk | 8 | ||||
| -rw-r--r-- | external/libmspub/UnpackedTarball_libmspub.mk | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk index b374c0483466..271aaf78e4d3 100644 --- a/external/libmspub/ExternalProject_libmspub.mk +++ b/external/libmspub/ExternalProject_libmspub.mk @@ -22,10 +22,6 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\ zlib \ )) -# -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR is needed when building against libc++ in C++17 mode, as -# libmspub configure checking for boost/ptr_container/ptr_vector.hpp can (indirectly) include -# Boost 1.65.1 workdir/UnpackedTarball/boost/boost/ptr_container/detail/reversible_ptr_container.hpp -# which mentions std::auto_ptr: $(call gb_ExternalProject_get_state_target,libmspub,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ @@ -40,9 +36,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : --disable-weffc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ - CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS) \ - -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED \ - -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" \ + CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS)" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk index 23e81eed785d..57845333cb4e 100644 --- a/external/libmspub/UnpackedTarball_libmspub.mk +++ b/external/libmspub/UnpackedTarball_libmspub.mk @@ -13,8 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libmspub,$(MSPUB_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libmspub,0)) -$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmspub)) - $(eval $(call gb_UnpackedTarball_add_patches,libmspub,\ external/libmspub/ubsan.patch \ )) |