summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-01-10 17:27:40 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-01-10 17:27:40 +0100
commit09204754c6e201fcab31894819472fda6d84cd45 (patch)
treeae2340d5698ad4dfa5762e8a4b4d4235e77dd8fb /package
parentdd63045944ec024872c97d6f89d4d87fe5aac926 (diff)
parent435cff735f24278f53678abda61b950a4a478895 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
-rw-r--r--package/boost/Makefile13
-rw-r--r--package/boost/patches/patch-boost_cstdint_hpp14
2 files changed, 8 insertions, 19 deletions
diff --git a/package/boost/Makefile b/package/boost/Makefile
index 8177a49a4..f204ccebe 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= boost
-PKG_VERSION:= 1.54.0
-PKG_RELEASE:= 4
-PKG_MD5SUM:= efbfbff5a85a9330951f243d0a46e4b9
+PKG_VERSION:= 1.55.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 93780777cfbf999a600f62883bd54b17
PKG_DESCR:= boost C++ library
PKG_SECTION:= libs
PKG_URL:= http://www.boost.org/
@@ -15,8 +15,8 @@ PKG_OPTS:= dev
PKG_ARCH_DEPENDS:= !avr32 !m68k
-DISTFILES:= boost_1_54_0.tar.gz
-WRKDIST= ${WRKDIR}/${PKG_NAME}_1_54_0
+DISTFILES:= boost_1_55_0.tar.gz
+WRKDIST= ${WRKDIR}/${PKG_NAME}_1_55_0
PKG_FLAVOURS_BOOST:= date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave
@@ -126,7 +126,10 @@ endif
( cd ${WRKBUILD}; \
${BJAM_PATH} \
-sBUILD=release \
+ -d 2 \
target-os=linux \
+ architecture=$(CPU_ARCH) \
+ binary-format=elf \
toolset=gcc-${GPP_VERSION} \
--build-type=minimal \
--layout=versioned \
diff --git a/package/boost/patches/patch-boost_cstdint_hpp b/package/boost/patches/patch-boost_cstdint_hpp
deleted file mode 100644
index 5b09e892b..000000000
--- a/package/boost/patches/patch-boost_cstdint_hpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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