diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2017-11-22 23:08:06 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2018-01-18 14:44:25 +0100 |
| commit | 4082a18406c18af7b4fcef7bd501c3679c3be56b (patch) | |
| tree | 761952db6eea1fc3fab672a8d739562eaf1fb031 /external/boost | |
| parent | 0e8d0fe001ceecea95ad7115b835527e13252a17 (diff) | |
android: use unified headers and llvm-c++ STL (x86) with NDK 16
gnustl (and others) are to be removed in future versions of the ndk
also bump gradle and build-tools to current versions along with it
arm unfortunately crashes with llvm-c++, so keep with gnustl for now/fix
that later
Change-Id: Ic794c3293b599b77ec48096bf3283a99c09cbb79
Reviewed-on: https://gerrit.libreoffice.org/45163
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'external/boost')
| -rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 3 | ||||
| -rw-r--r-- | external/boost/boost-android-unified.patch.1 | 28 |
2 files changed, 31 insertions, 0 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 4156bf7c3261..44ee759141e5 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -37,6 +37,9 @@ 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 +# https://svn.boost.org/trac10/ticket/13230 +boost_patches += boost-android-unified.patch.1 + $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) diff --git a/external/boost/boost-android-unified.patch.1 b/external/boost/boost-android-unified.patch.1 new file mode 100644 index 000000000000..458482a37c28 --- /dev/null +++ b/external/boost/boost-android-unified.patch.1 @@ -0,0 +1,28 @@ +https://svn.boost.org/trac10/ticket/13230 unified headers causing trouble with that.. +diff -ur boost.org/libs/filesystem/src/operations.cpp boost/libs/filesystem/src/operations.cpp +--- boost.org/libs/filesystem/src/operations.cpp 2017-11-22 02:21:33.724304181 +0100 ++++ boost/libs/filesystem/src/operations.cpp 2017-11-22 02:21:59.686302450 +0100 +@@ -11,23 +11,6 @@ + //--------------------------------------------------------------------------------------// + + // define 64-bit offset macros BEFORE including boost/config.hpp (see ticket #5355) +-#if !(defined(__HP_aCC) && defined(_ILP32) && !defined(_STATVFS_ACPP_PROBLEMS_FIXED)) +-#define _FILE_OFFSET_BITS 64 // at worst, these defines may have no effect, +-#endif +-#if !defined(__PGI) +-#define __USE_FILE_OFFSET64 // but that is harmless on Windows and on POSIX +- // 64-bit systems or on 32-bit systems which don't have files larger +- // than can be represented by a traditional POSIX/UNIX off_t type. +- // OTOH, defining them should kick in 64-bit off_t's (and thus +- // st_size)on 32-bit systems that provide the Large File +- // Support (LFS)interface, such as Linux, Solaris, and IRIX. +- // The defines are given before any headers are included to +- // ensure that they are available to all included headers. +- // That is required at least on Solaris, and possibly on other +- // systems as well. +-#else +-#define _FILE_OFFSET_BITS 64 +-#endif + + // define BOOST_FILESYSTEM_SOURCE so that <boost/filesystem/config.hpp> knows + // the library is being built (possibly exporting rather than importing code) |