diff options
| author | Saul Wold <sgw@linux.intel.com> | 2013-07-11 13:06:07 -0700 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2013-07-12 10:12:12 -0700 |
| commit | 0115604c5b2fa649f27d734e8ae3b730d1e374ea (patch) | |
| tree | 2b6553f0416d2cbc2e2921521168f2e78d657dc3 | |
| parent | e516f18d663447954082b5d2df6c1033cb9b4e65 (diff) | |
| download | openembedded-core-0115604c5b2fa649f27d734e8ae3b730d1e374ea.tar.gz openembedded-core-0115604c5b2fa649f27d734e8ae3b730d1e374ea.tar.bz2 openembedded-core-0115604c5b2fa649f27d734e8ae3b730d1e374ea.zip | |
boost: backport glibc patch for new eglibc
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>
| -rw-r--r-- | meta/recipes-support/boost/boost_1.54.0.bb | 1 | ||||
| -rw-r--r-- | meta/recipes-support/boost/files/glibc.patch | 26 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-support/boost/boost_1.54.0.bb b/meta/recipes-support/boost/boost_1.54.0.bb index 68f483cc6b..3cf88fa3c1 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 0000000000..c33ea64713 --- /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 |