diff options
| author | David Tardon <dtardon@redhat.com> | 2018-01-02 09:54:19 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2018-01-08 14:18:31 +0100 |
| commit | 65197e46df544dd0f2c28fa245b1810bab98b519 (patch) | |
| tree | 1e79577b75b79404ade99ab9c5e443f96a0e74e8 /external | |
| parent | 6e0cd872f5f922244a42ca2c445c80a5c5bb6c08 (diff) | |
upload libabw 0.1.2
Change-Id: I972ff9e0dbb73f6a38c886e1acd03cc4d62da2ec
Reviewed-on: https://gerrit.libreoffice.org/47251
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit f04ad5673a9de1eda94ed3ae5719d8b761da80bb)
Reviewed-on: https://gerrit.libreoffice.org/47487
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libabw/ExternalProject_libabw.mk | 3 | ||||
| -rw-r--r-- | external/libabw/UnpackedTarball_libabw.mk | 4 | ||||
| -rw-r--r-- | external/libabw/libabw-msvc.patch.1 | 46 |
3 files changed, 51 insertions, 2 deletions
diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk index d8e4d112ea35..c8c2bd2e9882 100644 --- a/external/libabw/ExternalProject_libabw.mk +++ b/external/libabw/ExternalProject_libabw.mk @@ -35,8 +35,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) : --disable-werror \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ - CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS) \ - -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk index 7b9ba49e7e69..27195d3a0ab3 100644 --- a/external/libabw/UnpackedTarball_libabw.mk +++ b/external/libabw/UnpackedTarball_libabw.mk @@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0)) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libabw)) +$(eval $(call gb_UnpackedTarball_add_patches,libabw, \ + external/libabw/libabw-msvc.patch.1 \ +)) + ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libabw, \ diff --git a/external/libabw/libabw-msvc.patch.1 b/external/libabw/libabw-msvc.patch.1 new file mode 100644 index 000000000000..d14b122f9575 --- /dev/null +++ b/external/libabw/libabw-msvc.patch.1 @@ -0,0 +1,46 @@ +From 49f6461d4751d3b16e32ab8f9c93a3856b33be49 Mon Sep 17 00:00:00 2001 +From: Miklos Vajna <vmiklos@collabora.co.uk> +Date: Wed, 2 Aug 2017 14:53:36 +0200 +Subject: [PATCH] m4: MSVC defines __cplusplus as 199711L still + +See e.g. +<https://stackoverflow.com/questions/37503029/cplusplus-is-equal-to-199711-in-msvc-does-it-support-c11>, +on MSVC we can't depend on the value of __cplusplus, since that one is a +too low value, even if everything else works fine. +--- + m4/ax_cxx_compile_stdcxx.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff -Naur a/configure b/configure +--- a/configure 2017-08-02 14:50:09.000000000 +0200 ++++ b/configure 2017-08-02 14:50:57.000000000 +0200 +@@ -16001,7 +16001,7 @@ + + #error "This is not a C++ compiler" + +-#elif __cplusplus < 201103L ++#elif __cplusplus < 201103L && !(defined _MSC_VER) + + #error "This is not a C++11 compiler" + +@@ -16314,7 +16314,7 @@ + + #error "This is not a C++ compiler" + +-#elif __cplusplus < 201103L ++#elif __cplusplus < 201103L && !(defined _MSC_VER) + + #error "This is not a C++11 compiler" + +@@ -16636,7 +16636,7 @@ + + #error "This is not a C++ compiler" + +-#elif __cplusplus < 201103L ++#elif __cplusplus < 201103L && !(defined _MSC_VER) + + #error "This is not a C++11 compiler" + +-- +2.12.3 + |