external/boost/UnpackedTarball_boost.mk | 2 --
external/boost/boost-android-unified.patch.1 | 22 ----------------------
2 files changed, 24 deletions(-)
New commits:
commit d5c28daeb498dcdd4d211415d8eae4d82c3ffc82
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Feb 16 17:26:29 2022 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Feb 16 21:12:03 2022 +0100
Remove apparently obsolete external/boost/boost-android-unified.patch.1
The two checks for __clang_major__ == 5 etc. had been added with
23a8d5ffbbe58761b89f590f0735abccd69a3681 "Upgrade external/boost to
Boost 1.69.0" because "with the non-standard Clang 5.0.300080 from NDK
r16b, the
build now caused failures". But for our current Android build baseline NDK
r19c
(cf. README.md),
> $ android-ndk-r19c/toolchains/llvm/prebuilt/linux-x86_64/bin/clang
--version
> Android (5058415 based on r339409) clang version 8.0.2
(https://android.googlesource.com/toolchain/clang
40173bab62ec746213857d083c0e8b0abb568790)
(https://android.googlesource.com/toolchain/llvm
7a6618d69e7e8111e1d49dc9e7813767c5ca756a) (based on LLVM 8.0.2svn)
[...]
has __clang_major__ == 8 by now.
Change-Id: I5a5131c14ddf410ed60337992c2d827792c3bbc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130029
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/boost/UnpackedTarball_boost.mk
b/external/boost/UnpackedTarball_boost.mk
index 1875876f0645..5f0e9066a839 100644
--- a/external/boost/UnpackedTarball_boost.mk
+++ b/external/boost/UnpackedTarball_boost.mk
@@ -30,8 +30,6 @@ boost_patches += clang-cl.patch.0
boost_patches += boost_1_60_0.undef.warning.patch
boost_patches += boost_1_63_0.undef.warning.patch.1
-boost_patches += boost-android-unified.patch.1
-
boost_patches += windows-no-utf8-locales.patch.0
boost_patches += msvc2017.patch.0
diff --git a/external/boost/boost-android-unified.patch.1
b/external/boost/boost-android-unified.patch.1
deleted file mode 100644
index 6488bf619e2b..000000000000
--- a/external/boost/boost-android-unified.patch.1
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/boost/type_traits/detail/is_function_cxx_11.hpp
-+++ b/boost/type_traits/detail/is_function_cxx_11.hpp
-@@ -18,7 +18,7 @@
- template <class T>
- struct is_function : public false_type {};
-
--#if defined(__cpp_noexcept_function_type) &&
!defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM)
-+#if defined(__cpp_noexcept_function_type) &&
!defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM) && !(defined __ANDROID__ &&
defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 0 &&
__clang_patchlevel__ == 300080)
- #define BOOST_TT_NOEXCEPT_PARAM , bool NE
- #define BOOST_TT_NOEXCEPT_DECL noexcept(NE)
- #else
---- a/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
-+++ b/boost/type_traits/detail/is_member_function_pointer_cxx_11.hpp
-@@ -31,7 +31,7 @@
- template <class T>
- struct is_member_function_pointer<T const volatile> : public
is_member_function_pointer<T> {};
-
--#if defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM)
-+#if defined(BOOST_TT_NO_DEDUCED_NOEXCEPT_PARAM) || (defined __ANDROID__ &&
defined __clang__ && __clang_major__ == 5 && __clang_minor__ == 0 &&
__clang_patchlevel__ == 300080)
- // MSVC can't handle noexcept(b) as a deduced template parameter
- // so we will have to write everything out :(
- #define BOOST_TT_NOEXCEPT_PARAM
