diff options
| author | David Tardon <dtardon@redhat.com> | 2017-07-17 14:35:01 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-07-17 14:36:03 +0200 |
| commit | 27b8376eda4c1f69a20a41743a7454d824b4311a (patch) | |
| tree | d8c1606f84c28ce5a27c421d2a29038a641ca95f /external/libwps | |
| parent | cd1d5f35cb0f9c455787819de56e24cd51e6c5cc (diff) | |
try to fix osx build of libwps
Change-Id: I0aeea8fd3f84cecd8b308cbc3ad629fe8e24634e
Diffstat (limited to 'external/libwps')
| -rw-r--r-- | external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 | 27 | ||||
| -rw-r--r-- | external/libwps/UnpackedTarball_libwps.mk | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 b/external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 new file mode 100644 index 000000000000..c5aca0e7d380 --- /dev/null +++ b/external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 @@ -0,0 +1,27 @@ +From 01d2ef67b9076fd82ecc6937bdbb306b489fd29e Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Mon, 17 Jul 2017 14:34:12 +0200 +Subject: [PATCH] try to fix build with older clang + +--- + src/lib/libwps_internal.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/lib/libwps_internal.h b/src/lib/libwps_internal.h +index 8e91806..8a5fccc 100644 +--- a/src/lib/libwps_internal.h ++++ b/src/lib/libwps_internal.h +@@ -85,8 +85,8 @@ struct WPS_shared_ptr_noop_deleter + + /** fall through attributes */ + #define WPS_FALLTHROUGH +-#if defined(__clang__) +-# if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough) ++#if defined(__clang__) && defined(__has_cpp_attribute) ++# if __has_cpp_attribute(clang::fallthrough) + # undef WPS_FALLTHROUGH + # define WPS_FALLTHROUGH [[clang::fallthrough]] + # endif +-- +2.13.0 + diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk index fb88c2948453..c91911b0e7ce 100644 --- a/external/libwps/UnpackedTarball_libwps.mk +++ b/external/libwps/UnpackedTarball_libwps.mk @@ -35,6 +35,7 @@ endif $(eval $(call gb_UnpackedTarball_add_patches,libwps, \ external/libwps/iOS.patch.0 \ + external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 \ )) # vim: set noet sw=4 ts=4: |