summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/boost/Makefile11
-rw-r--r--package/boost/patches/patch-boost_atomic_detail_caps_gcc_atomic_hpp8
2 files changed, 13 insertions, 6 deletions
diff --git a/package/boost/Makefile b/package/boost/Makefile
index 7d5a231ab..cfa9d80ce 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -15,12 +15,12 @@ PKG_URL:= http://www.boost.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/}
PKG_OPTS:= dev
-PKG_ARCH_DEPENDS:= !m68k !xtensa
+PKG_ARCH_DEPENDS:= !m68k
DISTFILES:= boost_$(PKG_EXTRAVER)_0.tar.gz
WRKDIST= ${WRKDIR}/${PKG_NAME}_$(PKG_EXTRAVER)_0
-PKG_FLAVOURS_BOOST:= DATE_TIME GRAPH GRAPH_PARALLEL IOSTREAMS MATH PROGRAM_OPTIONS PYTHON REGEX SERIALIZATION SIGNALS TEST WAVE
+PKG_FLAVOURS_BOOST:= DATE_TIME GRAPH GRAPH_PARALLEL IOSTREAMS LOG MATH PROGRAM_OPTIONS PYTHON REGEX SERIALIZATION SIGNALS TEST WAVE
PKGFD_DATE_TIME:= with date-time
PKGFD_PYTHON:= with python
@@ -30,6 +30,7 @@ PKGFD_IOSTREAMS:= with iostreams
PKGFD_GRAPH:= with graph
PKGFD_GRAPH_PARALLEL:= with graph_parallel
PKGFD_MATH:= with math
+PKGFD_LOG:= with log
PKGFD_PROGRAM_OPTIONS:= with program_options
PKGFD_REGEX:= with regex
PKGFD_SERIALIZATION:= with serialization
@@ -52,6 +53,7 @@ CONFIGURE_ARGS+= --target=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=${WRKINST}/usr \
--ignore-site-config \
+ --without-mpi \
--without-locale
ifneq (${ADK_PACKAGE_BOOST_IOSTREAMS},)
@@ -68,6 +70,9 @@ endif
ifeq (${ADK_PACKAGE_BOOST_GRAPH},)
CONFIGURE_ARGS+= --without-graph
endif
+ifeq (${ADK_PACKAGE_BOOST_LOG},)
+CONFIGURE_ARGS+= --without-log
+endif
ifeq (${ADK_PACKAGE_BOOST_MATH},)
CONFIGURE_ARGS+= --without-math
endif
@@ -92,6 +97,8 @@ endif
ifeq ($(ADK_TARGET_ARCH),x86_64)
BOOST_ARCH:= x86
+else ifeq ($(ADK_TARGET_ARCH),ppc)
+BOOST_ARCH:= power
else
BOOST_ARCH:= $(ADK_TARGET_ARCH)
endif
diff --git a/package/boost/patches/patch-boost_atomic_detail_caps_gcc_atomic_hpp b/package/boost/patches/patch-boost_atomic_detail_caps_gcc_atomic_hpp
index 8a0f617da..74c1c43cb 100644
--- a/package/boost/patches/patch-boost_atomic_detail_caps_gcc_atomic_hpp
+++ b/package/boost/patches/patch-boost_atomic_detail_caps_gcc_atomic_hpp
@@ -1,8 +1,8 @@
---- boost_1_56_0.orig/boost/atomic/detail/caps_gcc_atomic.hpp 2014-07-07 20:40:41.000000000 +0200
-+++ boost_1_56_0/boost/atomic/detail/caps_gcc_atomic.hpp 2014-09-20 11:44:49.000000000 +0200
+--- boost_1_57_0.orig/boost/atomic/detail/caps_gcc_atomic.hpp 2014-10-01 04:30:37.000000000 -0500
++++ boost_1_57_0/boost/atomic/detail/caps_gcc_atomic.hpp 2015-05-12 17:26:04.821955497 -0500
@@ -128,7 +128,7 @@
- #define BOOST_ATOMIC_INT64_LOCK_FREE 0
- #endif
+ #define BOOST_ATOMIC_CHAR32_T_LOCK_FREE BOOST_ATOMIC_INT32_LOCK_FREE
+ #define BOOST_ATOMIC_CHAR16_T_LOCK_FREE BOOST_ATOMIC_INT16_LOCK_FREE
-#define BOOST_ATOMIC_THREAD_FENCE 2
-#define BOOST_ATOMIC_SIGNAL_FENCE 2