Patchwork boost: backport glibc patch for new eglibc

login
register
mail settings
Submitter Saul Wold
Date July 11, 2013, 8:02 p.m.
Message ID <1373572938-1891-1-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/53517/
State Accepted
Commit 0115604c5b2fa649f27d734e8ae3b730d1e374ea
Headers show

Comments

Saul Wold - July 11, 2013, 8:02 p.m.
The newer eglibc removed a macro that was being checked by the boost
code, this patch replaces that.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/boost/boost_1.54.0.bb   |    1 +
 meta/recipes-support/boost/files/glibc.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 meta/recipes-support/boost/files/glibc.patch

Patch

diff --git a/meta/recipes-support/boost/boost_1.54.0.bb b/meta/recipes-support/boost/boost_1.54.0.bb
index 68f483c..3cf88fa 100644
--- a/meta/recipes-support/boost/boost_1.54.0.bb
+++ b/meta/recipes-support/boost/boost_1.54.0.bb
@@ -2,4 +2,5 @@  include boost-${PV}.inc
 include boost.inc
 
 SRC_URI += "file://arm-intrinsics.patch \
+            file://glibc.patch \
            "
diff --git a/meta/recipes-support/boost/files/glibc.patch b/meta/recipes-support/boost/files/glibc.patch
new file mode 100644
index 0000000..c33ea64
--- /dev/null
+++ b/meta/recipes-support/boost/files/glibc.patch
@@ -0,0 +1,26 @@ 
+------------------------------------------------------------------------
+r84950 | johnmaddock | 2013-07-04 02:13:23 -0700 (Thu, 04 Jul 2013) | 2 lines
+
+Patch for recent versions of glibc which always assume int64_t support.
+Fixes #8731.
+
+Upstream-Status: Backport
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: boost_1_54_0/boost/cstdint.hpp
+===================================================================
+--- boost_1_54_0.orig/boost/cstdint.hpp
++++ boost_1_54_0/boost/cstdint.hpp
+@@ -41,7 +41,10 @@
+ // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG.
+ // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
+ //
+-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
++#if defined(BOOST_HAS_STDINT_H)					\
++  && (!defined(__GLIBC__)					\
++      || defined(__GLIBC_HAVE_LONG_LONG)			\
++      || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
+ 
+ // The following #include is an implementation artifact; not part of interface.
+ # ifdef __hpux