diff options
| author | Saul Wold <sgw@linux.intel.com> | 2013-07-11 13:06:07 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-13 18:23:37 +0100 |
| commit | 6cf5b4b270649d54b7cc9a761a5bad4b7eab13c0 (patch) | |
| tree | d786e31723fb461ff79fe72838e7a5d5881a76e6 | |
| parent | a6c5549ac3907839da0115d1de899c7a943785fe (diff) | |
| download | poky-6cf5b4b270649d54b7cc9a761a5bad4b7eab13c0.tar.gz | |
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.
(From OE-Core rev: 0115604c5b2fa649f27d734e8ae3b730d1e374ea)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 | |||
| 2 | include boost.inc | 2 | include boost.inc |
| 3 | 3 | ||
| 4 | SRC_URI += "file://arm-intrinsics.patch \ | 4 | SRC_URI += "file://arm-intrinsics.patch \ |
| 5 | file://glibc.patch \ | ||
| 5 | " | 6 | " |
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 @@ | |||
| 1 | ------------------------------------------------------------------------ | ||
| 2 | r84950 | johnmaddock | 2013-07-04 02:13:23 -0700 (Thu, 04 Jul 2013) | 2 lines | ||
| 3 | |||
| 4 | Patch for recent versions of glibc which always assume int64_t support. | ||
| 5 | Fixes #8731. | ||
| 6 | |||
| 7 | Upstream-Status: Backport | ||
| 8 | |||
| 9 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
| 10 | |||
| 11 | Index: boost_1_54_0/boost/cstdint.hpp | ||
| 12 | =================================================================== | ||
| 13 | --- boost_1_54_0.orig/boost/cstdint.hpp | ||
| 14 | +++ boost_1_54_0/boost/cstdint.hpp | ||
| 15 | @@ -41,7 +41,10 @@ | ||
| 16 | // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG. | ||
| 17 | // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990 | ||
| 18 | // | ||
| 19 | -#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG)) | ||
| 20 | +#if defined(BOOST_HAS_STDINT_H) \ | ||
| 21 | + && (!defined(__GLIBC__) \ | ||
| 22 | + || defined(__GLIBC_HAVE_LONG_LONG) \ | ||
| 23 | + || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17))))) | ||
| 24 | |||
| 25 | // The following #include is an implementation artifact; not part of interface. | ||
| 26 | # ifdef __hpux | ||
