diff options
| author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-10-01 09:03:19 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2013-10-01 09:03:19 +0200 |
| commit | 9019d28c87b2c0382834a8af861cda4dc12e2b06 (patch) | |
| tree | e3bf3da087056d9d8394ec808bc9a2ea989d9f65 /package/boost | |
| parent | 60e2481a45eba0e84e771453cda48075899e95e3 (diff) | |
| parent | 1bad8cf3c967cac8fb149217878b56f9cec03c8b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/boost')
| -rw-r--r-- | package/boost/Makefile | 4 | ||||
| -rw-r--r-- | package/boost/patches/patch-boost_cstdint_hpp | 14 |
2 files changed, 16 insertions, 2 deletions
diff --git a/package/boost/Makefile b/package/boost/Makefile index 168b20070..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 @@ -15,7 +15,7 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/} DISTFILES:= boost_1_54_0.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}_1_54_0 -PKG_ARCH_DEPENDS:= !mips +PKG_LIBC_DEPENDS:= eglibc glibc musl PKG_SUBPKGS:= BOOST BOOST_DEV PKGSD_BOOST_DEV:= boost header files 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 |