From 4b4846716ddb6321c9f9f21d983d1820bf50ea1c Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 2 Jan 2018 13:40:57 +0100 Subject: upload libmspub 0.1.3 Reviewed-on: https://gerrit.libreoffice.org/47256 Tested-by: Jenkins Reviewed-by: David Tardon (cherry picked from commit a3488acbeb3b618cf5b6b1a93608c58d0eb9d646) Change-Id: I1f759bf914e4a61fc943098f04661789d374ffdb Reviewed-on: https://gerrit.libreoffice.org/47360 Tested-by: Jenkins Reviewed-by: Michael Stahl --- external/libmspub/ExternalProject_libmspub.mk | 3 +-- external/libmspub/UnpackedTarball_libmspub.mk | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'external') diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk index 40ba3dc6e56e..271aaf78e4d3 100644 --- a/external/libmspub/ExternalProject_libmspub.mk +++ b/external/libmspub/ExternalProject_libmspub.mk @@ -36,8 +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" \ + 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 \ )) -- cgit