diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-02 13:06:50 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-02 13:06:50 +0200 |
| commit | 984ea37e4ecdc7fb5e277bf5a045af73b5204791 (patch) | |
| tree | ab106aa77066da3ff699b0421ade63d2e15a9dec /package/boost | |
| parent | 9c99c075a925519eb073744d9cbdaee596abb4ab (diff) | |
| parent | 771da6d340f447a74dd9306c866219a5e5b85b0d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/boost')
| -rw-r--r-- | package/boost/Makefile | 2 | ||||
| -rw-r--r-- | package/boost/patches/patch-boost_cstdint_hpp | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/package/boost/Makefile b/package/boost/Makefile index 271b2937c..cce3246fa 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= boost PKG_VERSION:= 1.54.0 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= efbfbff5a85a9330951f243d0a46e4b9 PKG_DESCR:= boost C++ library PKG_SECTION:= libs diff --git a/package/boost/patches/patch-boost_cstdint_hpp b/package/boost/patches/patch-boost_cstdint_hpp new file mode 100644 index 000000000..5b09e892b --- /dev/null +++ b/package/boost/patches/patch-boost_cstdint_hpp @@ -0,0 +1,14 @@ +--- boost_1_54_0.orig/boost/cstdint.hpp 2013-03-09 23:55:05.000000000 +0100 ++++ boost_1_54_0/boost/cstdint.hpp 2013-09-19 16:46:42.000000000 +0200 +@@ -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 |