[Libreoffice-commits] core.git: 2 commits - boost/boost.endian.patch boost/boost.wundef.patch boost/UnpackedTarball_boost.mk

[Tor Lillqvist]

 boost/UnpackedTarball_boost.mk |    1 +
 boost/boost.endian.patch       |   22 ++++++++++++++++++++++
 boost/boost.wundef.patch       |   11 +++++++++++
 3 files changed, 34 insertions(+)

New commits:
commit 58b9060b5f325f611dd7d5748dfa41b897aa09eb
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri May 24 14:57:20 2013 +0300

    Fix Boost endianness detection for Android
    
    Change-Id: I88006cced5975fc0748b33094ae39197daba49cc

diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 75eb479..bcec8b9 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -37,6 +37,7 @@ boost_patches += boost_1_44_0-clang-warnings.patch
 boost_patches += boost_1_44_0-gcc4.8.patch
 
 boost_patches += boost.auto_link.patch
+boost_patches += boost.endian.patch
 boost_patches += boost.loplugin.patch
 boost_patches += boost.std.move.patch
 boost_patches += boost.wundef.patch
diff --git a/boost/boost.endian.patch b/boost/boost.endian.patch
new file mode 100644
index 0000000..bf129f7
--- /dev/null
+++ b/boost/boost.endian.patch
@@ -0,0 +1,22 @@
+--- foo/foo/foo/boost/detail/endian.hpp
++++ foo/foo/foo/boost/detail/endian.hpp
+@@ -28,16 +28,16 @@
+ #ifndef BOOST_DETAIL_ENDIAN_HPP
+ #define BOOST_DETAIL_ENDIAN_HPP
+ 
+-// GNU libc offers the helpful header <endian.h> which defines
++// GNU libc and Android's bionic offer the helpful header <endian.h> which defines
+ // __BYTE_ORDER
+ 
+-#if defined (__GLIBC__)
++#if defined (__GLIBC__) || defined(__ANDROID__)
+ # include <endian.h>
+ # if (__BYTE_ORDER == __LITTLE_ENDIAN)
+ #  define BOOST_LITTLE_ENDIAN
+ # elif (__BYTE_ORDER == __BIG_ENDIAN)
+ #  define BOOST_BIG_ENDIAN
+-# elif (__BYTE_ORDER == __PDP_ENDIAN)
++# elif defined(__PDP_ENDIAN) && (__BYTE_ORDER == __PDP_ENDIAN)
+ #  define BOOST_PDP_ENDIAN
+ # else
+ #  error Unknown machine endianness detected.
commit d972b212f6f7a2b40ed85ba2ec08a228decc3f70
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri May 24 14:50:03 2013 +0300

    WaE: "__GXX_EXPERIMENTAL_CXX0X__" is not defined
    
    Change-Id: I66447ffe1a5f364377b80756f6c08f6986ce4eef

diff --git a/boost/boost.wundef.patch b/boost/boost.wundef.patch
index a389d50..c4928ed 100644
--- a/boost/boost.wundef.patch
+++ b/boost/boost.wundef.patch
@@ -9,6 +9,17 @@
  namespace {
    multi_array_types::extent_gen extents;
    multi_array_types::index_gen indices;
+--- foo/foo/foo/boost/preprocessor/config/config.hpp
++++ foo/foo/foo/boost/preprocessor/config/config.hpp
+@@ -90,7 +90,7 @@
+ #            define BOOST_PP_VARIADICS 0
+ #        endif
+ #    /* Wave (C/C++), GCC (C++) */
+-#    elif defined __WAVE__ && __WAVE_HAS_VARIADICS__ || defined __GNUC__ && __GXX_EXPERIMENTAL_CXX0X__
++#    elif defined __WAVE__ && __WAVE_HAS_VARIADICS__ || defined __GNUC__ && defined __GXX_EXPERIMENTAL_CXX0X__ && __GXX_EXPERIMENTAL_CXX0X__
+ #        define BOOST_PP_VARIADICS 1
+ #    /* EDG-based (C/C++), GCC (C), and unknown (C/C++) */
+ #    elif !defined __cplusplus && __STDC_VERSION__ >= 199901L || __cplusplus >= 201103L
 --- foo/foo/foo/boost/preprocessor/tuple/elem.hpp
 +++ foo/foo/foo/boost/preprocessor/tuple/elem.hpp
 @@ -22,7 +22,7 @@