summaryrefslogtreecommitdiff
path: root/meta-pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'meta-pkgs')
-rw-r--r--meta-pkgs/boost/Makefile.common5
-rw-r--r--meta-pkgs/boost/distinfo17
-rw-r--r--meta-pkgs/boost/patches/patch-ab4
-rw-r--r--meta-pkgs/boost/patches/patch-ad8
-rw-r--r--meta-pkgs/boost/patches/patch-ae14
-rw-r--r--meta-pkgs/boost/patches/patch-af4
-rw-r--r--meta-pkgs/boost/patches/patch-ag15
-rw-r--r--meta-pkgs/boost/patches/patch-ah15
8 files changed, 65 insertions, 17 deletions
diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common
index 7f46a0ece99..a60ecc59274 100644
--- a/meta-pkgs/boost/Makefile.common
+++ b/meta-pkgs/boost/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2010/11/26 20:47:01 adam Exp $
+# $NetBSD: Makefile.common,v 1.27 2011/02/24 11:05:35 adam Exp $
#
# used by devel/boost-build/Makefile
# used by devel/boost-docs/Makefile
@@ -10,7 +10,7 @@
BOOST_PACKAGE?= undefined
BOOST_COMMENT?= undefined
-BOOST_VERSION= 1.45.0
+BOOST_VERSION= 1.46.0
BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//}
DISTNAME= boost_${BOOST_VERSION:S/./_/g}
@@ -30,6 +30,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://www.boost.org/
COMMENT= Free, peer-reviewed portable C++ source libraries ${BOOST_COMMENT}
+LICENSE= boost-license
CONFLICTS+= boost<1.36.0
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo
index 73cd8e12f80..39c7ac94ddf 100644
--- a/meta-pkgs/boost/distinfo
+++ b/meta-pkgs/boost/distinfo
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.30 2010/11/26 20:47:01 adam Exp $
+$NetBSD: distinfo,v 1.31 2011/02/24 11:05:35 adam Exp $
-SHA1 (boost_1_45_0.tar.bz2) = eb7424ef99df4e38af7431e38ff9849651b8aaf5
-RMD160 (boost_1_45_0.tar.bz2) = 1402cb49e0d680268109ef1bf16aea9bc4a127b0
-Size (boost_1_45_0.tar.bz2) = 39330184 bytes
+SHA1 (boost_1_46_0.tar.bz2) = 1fbd865602b61a881c0e6093f58adf999e28ca4d
+RMD160 (boost_1_46_0.tar.bz2) = 42507cc8813b4cbfc9a87da0575985bfcf560d78
+Size (boost_1_46_0.tar.bz2) = 41939809 bytes
SHA1 (patch-aa) = b42e255c8ad2138f226ec14633aedeb9b9a9fd32
-SHA1 (patch-ab) = 2fa89ce671e5fb0dca160a820524cff2d1ec8927
+SHA1 (patch-ab) = b6898f7b12d2fdbaacb25a0643d4d8af6c460602
SHA1 (patch-ac) = 54d40e6a62cdf40c4155c64d9f02df475fbe111d
-SHA1 (patch-ad) = 299272ecd11cab1b5af099ef1a65e6db1daa4784
-SHA1 (patch-af) = ef9a9363420f519c45baaf98badff4c885a7595c
+SHA1 (patch-ad) = d36799e40e1f7e6f62768e1144859f22ce76a265
+SHA1 (patch-ae) = 0acb8eaa1b5096d86ef0cd1320363f9ae75b7090
+SHA1 (patch-af) = 810ed54c1a84fb0b36e14d6917b90db87890234f
+SHA1 (patch-ag) = badf96038d7ac5bc566c6ce685116e756d976b13
+SHA1 (patch-ah) = c32b43bdbbe3cecc15ad56172083ee6ed926b45b
SHA1 (patch-aq) = e5c7b72ffa2942ce401f3d9bf05498fd761df17a
SHA1 (patch-ar) = 91981e2edb93666de78c203a6cef3d5011b2b26a
diff --git a/meta-pkgs/boost/patches/patch-ab b/meta-pkgs/boost/patches/patch-ab
index 38323523525..01160ef258f 100644
--- a/meta-pkgs/boost/patches/patch-ab
+++ b/meta-pkgs/boost/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2009/08/21 14:54:30 adam Exp $
+$NetBSD: patch-ab,v 1.4 2011/02/24 11:05:36 adam Exp $
--- boost/config/platform/bsd.hpp.orig 2009-08-20 17:55:59.000000000 +0200
+++ boost/config/platform/bsd.hpp
-@@ -37,7 +37,7 @@
+@@ -50,7 +50,7 @@
// and not in <unistd.h>
//
#if (defined(__FreeBSD__) && (__FreeBSD__ <= 3))\
diff --git a/meta-pkgs/boost/patches/patch-ad b/meta-pkgs/boost/patches/patch-ad
index c3d021e4eb5..3030e3aa8fc 100644
--- a/meta-pkgs/boost/patches/patch-ad
+++ b/meta-pkgs/boost/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.10 2010/08/28 15:28:55 adam Exp $
+$NetBSD: patch-ad,v 1.11 2011/02/24 11:05:36 adam Exp $
---- boost/archive/basic_archive.hpp.orig 2010-08-28 14:31:24.000000000 +0000
+--- boost/archive/basic_archive.hpp.orig 2011-01-19 17:33:55.000000000 +0000
+++ boost/archive/basic_archive.hpp
@@ -115,7 +115,7 @@ public:
explicit class_id_type(const int t_) : t(t_){
- assert(t_ <= boost::integer_traits<base_type>::const_max);
+ BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
}
- explicit class_id_type(const std::size_t t_) : t(t_){
+ explicit class_id_type(const size_t t_) : t(t_){
- // assert(t_ <= boost::integer_traits<base_type>::const_max);
+ // BOOST_ASSERT(t_ <= boost::integer_traits<base_type>::const_max);
}
class_id_type(const class_id_type & t_) :
diff --git a/meta-pkgs/boost/patches/patch-ae b/meta-pkgs/boost/patches/patch-ae
new file mode 100644
index 00000000000..b5f416ab360
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.6 2011/02/24 11:05:36 adam Exp $
+
+Pass CFLAGS to the compiler.
+
+--- tools/build/v2/engine/src/build.sh.orig 2011-02-24 08:42:55.000000000 +0000
++++ tools/build/v2/engine/src/build.sh
+@@ -237,6 +237,7 @@ case $BOOST_JAM_TOOLSET in
+ error_exit "Unknown toolset: $BOOST_JAM_TOOLSET"
+ ;;
+ esac
++BOOST_JAM_CC="${BOOST_JAM_CC} ${CFLAGS}"
+
+ echo "###"
+ echo "### Using '$BOOST_JAM_TOOLSET' toolset."
diff --git a/meta-pkgs/boost/patches/patch-af b/meta-pkgs/boost/patches/patch-af
index 35e8566db05..b343fb53d8d 100644
--- a/meta-pkgs/boost/patches/patch-af
+++ b/meta-pkgs/boost/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2009/03/13 07:48:57 hasso Exp $
+$NetBSD: patch-af,v 1.6 2011/02/24 11:05:36 adam Exp $
--- boost/config/platform/bsd.hpp.orig 2009-03-12 09:41:50 +0200
+++ boost/config/platform/bsd.hpp 2009-03-12 15:37:16 +0200
-@@ -62,7 +62,7 @@
+@@ -75,7 +75,7 @@
//
// The BSD <ctype.h> has macros only, no functions:
//
diff --git a/meta-pkgs/boost/patches/patch-ag b/meta-pkgs/boost/patches/patch-ag
new file mode 100644
index 00000000000..b6aa5e2ff79
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.5 2011/02/24 11:05:36 adam Exp $
+
+Pass CFLAGS to the compiler.
+
+--- tools/build/v2/engine/src/build.jam.orig 2011-02-24 08:50:34.000000000 +0000
++++ tools/build/v2/engine/src/build.jam
+@@ -195,7 +195,7 @@ toolset como como : "-o " : -D
+ : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
+ ## Clang Linux 2.8+
+ toolset clang clang : "-o " : -D
+- : -Wno-unused -Wno-format
++ : $(CFLAGS) -Wno-unused -Wno-format
+ [ opt --release : -Os ]
+ [ opt --debug : -g -O0 -fno-inline ]
+ [ opt --profile : -finline-functions -g ]
diff --git a/meta-pkgs/boost/patches/patch-ah b/meta-pkgs/boost/patches/patch-ah
new file mode 100644
index 00000000000..42ec76575e7
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.4 2011/02/24 11:05:36 adam Exp $
+
+Clang does not have (yet) std::forward.
+
+--- boost/unordered/detail/fwd.hpp.orig 2011-02-24 09:48:11.000000000 +0000
++++ boost/unordered/detail/fwd.hpp
+@@ -32,7 +32,7 @@
+ // E = Key Extractor
+
+ #if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_VARIADIC_TEMPLATES)
+-# if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
++# if defined(__clang__) || defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
+ // STLport doesn't have std::forward.
+ # else
+ # define BOOST_UNORDERED_STD_FORWARD
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 13:54:06 +0000