* Fix building with GCC (PR#48388).

* Build long double math libraries on NetBSD and FreeBSD.
* Removed obsolete patches.

8 files changed, 56 insertions, 107 deletions

diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common
index 6a49443a976..c602b7da049 100644
--- a/meta-pkgs/boost/Makefile.common
+++ b/meta-pkgs/boost/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2013/11/12 16:49:07 adam Exp $
+# $NetBSD: Makefile.common,v 1.42 2013/11/20 19:17:55 adam Exp $
 #
 # used by devel/boost-build/Makefile
 # used by devel/boost-docs/Makefile
@@ -19,6 +19,7 @@ CATEGORIES=		devel
 PKGNAME=	boost-${BOOST_VERSION}
 .else # ${BOOST_PACKAGE} != "meta-pkg"
 PKGNAME=	boost-${BOOST_PACKAGE}-${BOOST_VERSION}
+PKGREVISION=	1
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=boost/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo
index 93ba7fcc703..79ef7c0b8c6 100644
--- a/meta-pkgs/boost/distinfo
+++ b/meta-pkgs/boost/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.60 2013/11/12 16:49:07 adam Exp $
+$NetBSD: distinfo,v 1.61 2013/11/20 19:17:55 adam Exp $
 
 SHA1 (boost_1_55_0.tar.bz2) = cef9a0cc7084b1d639e06cd3bc34e4251524c840
 RMD160 (boost_1_55_0.tar.bz2) = de8ef647933a005119425326b59723aad4a6fd4f
@@ -9,11 +9,11 @@ SHA1 (patch-ac) = 32d14b50682dae1950ed927ecb9318ad6b07687a
 SHA1 (patch-ad) = 0e5dc31c3425de94444f97a9b7dec97ed5967733
 SHA1 (patch-ae) = 2fb49c90bbb3fd797ccdfaaf44c93494a5988f52
 SHA1 (patch-ag) = c406e9beb9260db7861b13a6eb4c386f23346eb1
-SHA1 (patch-ai) = 231db48819aa563b2082d95bb91d662b5d6cf779
 SHA1 (patch-aq) = e5c7b72ffa2942ce401f3d9bf05498fd761df17a
 SHA1 (patch-ar) = 2fec2c51272cc4ee376e6538d8f1fd8561a7f0a3
 SHA1 (patch-boost_archive_iterators_transform__width.hpp) = 5c08bac63fcc259997a8cf6fac1684f45ef7cd1a
-SHA1 (patch-boost_foreach.hpp) = 7cd26c4983873bcac284ad400950e341c559f9a8
-SHA1 (patch-boost_foreach_fwd.hpp) = 5accd68d559213a9677f7d1204e72dd082a42a41
+SHA1 (patch-boost_asio_detail_config.hpp) = b95ca6b0bb6c805624cb81c91c3f1b691a7425ca
+SHA1 (patch-boost_math_tools_config.hpp) = 81402bc38dc858d0818ed91e204966c8382be4ff
+SHA1 (patch-boost_noncopyable.hpp) = 6567b5932c6bb48e8b2fcae48ff47e0f230fc1b9
 SHA1 (patch-libs_config_configure) = e2f204d4fa4f1bd9b4131d28f9be0a1ac22bf711
 SHA1 (patch-libs_filesystem_src_unique_path.cpp) = 4693ea11cf464d82168cecaa143b48affa94563b
diff --git a/meta-pkgs/boost/patches/patch-ai b/meta-pkgs/boost/patches/patch-ai
deleted file mode 100644
index 5fa0a63c569..00000000000
--- a/meta-pkgs/boost/patches/patch-ai
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ai,v 1.5 2012/07/02 07:02:26 adam Exp $
-
-https://svn.boost.org/trac/boost/ticket/6098
-
---- boost/asio/detail/impl/kqueue_reactor.ipp.orig	2011-11-06 17:01:14.000000000 +0000
-+++ boost/asio/detail/impl/kqueue_reactor.ipp
-@@ -290,9 +290,9 @@ void kqueue_reactor::deregister_descript
-     {
-       struct kevent events[2];
-       BOOST_ASIO_KQUEUE_EV_SET(&events[0], descriptor,
--          EVFILT_READ, EV_DELETE, 0, 0, 0);
-+          EVFILT_READ, EV_DELETE, 0, 0, (void*)0);
-       BOOST_ASIO_KQUEUE_EV_SET(&events[1], descriptor,
--          EVFILT_WRITE, EV_DELETE, 0, 0, 0);
-+          EVFILT_WRITE, EV_DELETE, 0, 0, (void*)0);
-       ::kevent(kqueue_fd_, events, 2, 0, 0, 0);
-     }
- 
-@@ -331,9 +331,9 @@ void kqueue_reactor::deregister_internal
-   {
-     struct kevent events[2];
-     BOOST_ASIO_KQUEUE_EV_SET(&events[0], descriptor,
--        EVFILT_READ, EV_DELETE, 0, 0, 0);
-+        EVFILT_READ, EV_DELETE, 0, 0, (void*)0);
-     BOOST_ASIO_KQUEUE_EV_SET(&events[1], descriptor,
--        EVFILT_WRITE, EV_DELETE, 0, 0, 0);
-+        EVFILT_WRITE, EV_DELETE, 0, 0, (void*)0);
-     ::kevent(kqueue_fd_, events, 2, 0, 0, 0);
- 
-     op_queue<operation> ops;
diff --git a/meta-pkgs/boost/patches/patch-boost_asio_detail_config.hpp b/meta-pkgs/boost/patches/patch-boost_asio_detail_config.hpp
new file mode 100644
index 00000000000..1929dcee4f2
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-boost_asio_detail_config.hpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-boost_asio_detail_config.hpp,v 1.1 2013/11/20 19:17:55 adam Exp $
+
+GCC 4.5.x does not have std:addressof.
+
+--- boost/asio/detail/config.hpp.orig	2013-11-20 17:59:30.000000000 +0000
++++ boost/asio/detail/config.hpp
+@@ -333,11 +333,11 @@
+ #   define BOOST_ASIO_HAS_STD_ADDRESSOF 1
+ #  endif // defined(BOOST_ASIO_HAS_CLANG_LIBCXX)
+ #  if defined(__GNUC__)
+-#   if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ > 4)
++#   if ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)) || (__GNUC__ > 4)
+ #    if defined(__GXX_EXPERIMENTAL_CXX0X__)
+ #     define BOOST_ASIO_HAS_STD_ADDRESSOF 1
+ #    endif // defined(__GXX_EXPERIMENTAL_CXX0X__)
+-#   endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5)) || (__GNUC__ > 4)
++#   endif // ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5)) || (__GNUC__ > 4)
+ #  endif // defined(__GNUC__)
+ #  if defined(BOOST_ASIO_MSVC)
+ #   if (_MSC_VER >= 1700)
diff --git a/meta-pkgs/boost/patches/patch-boost_foreach.hpp b/meta-pkgs/boost/patches/patch-boost_foreach.hpp
deleted file mode 100644
index 0f5a8bbf5b6..00000000000
--- a/meta-pkgs/boost/patches/patch-boost_foreach.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-boost_foreach.hpp,v 1.3 2012/07/03 19:46:30 adam Exp $
-
-https://svn.boost.org/trac/boost/ticket/6131
-
---- boost/foreach.hpp.orig	2012-01-09 15:55:10.000000000 +0000
-+++ boost/foreach.hpp
-@@ -165,7 +165,7 @@ namespace foreach
- //   this one works on legacy compilers. Overload boost_foreach_is_lightweight_proxy
- //   at the global namespace for your type.
- template<typename T>
--inline boost::foreach::is_lightweight_proxy<T> *
-+inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *
- boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
- 
- template<typename T>
-@@ -190,7 +190,7 @@ boost_foreach_is_lightweight_proxy(T **&
- //   this one works on legacy compilers. Overload boost_foreach_is_noncopyable
- //   at the global namespace for your type.
- template<typename T>
--inline boost::foreach::is_noncopyable<T> *
-+inline boost::BOOST_FOREACH::is_noncopyable<T> *
- boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
- 
- namespace boost
diff --git a/meta-pkgs/boost/patches/patch-boost_foreach_fwd.hpp b/meta-pkgs/boost/patches/patch-boost_foreach_fwd.hpp
deleted file mode 100644
index fcfd15ac3bf..00000000000
--- a/meta-pkgs/boost/patches/patch-boost_foreach_fwd.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-boost_foreach_fwd.hpp,v 1.3 2012/07/03 19:46:30 adam Exp $
-
-https://svn.boost.org/trac/boost/ticket/6131
-
---- boost/foreach_fwd.hpp.orig	2012-01-09 15:58:44.000000000 +0000
-+++ boost/foreach_fwd.hpp
-@@ -14,6 +14,8 @@
- #ifndef BOOST_FOREACH_FWD_HPP
- #define BOOST_FOREACH_FWD_HPP
- 
-+#include <utility> // for std::pair
-+
- // This must be at global scope, hence the uglified name
- enum boost_foreach_argument_dependent_lookup_hack
- {
-@@ -25,6 +27,9 @@ namespace boost
- 
- namespace foreach
- {
-+    template<typename T>
-+    std::pair<T, T> in_range(T begin, T end);
-+
-     ///////////////////////////////////////////////////////////////////////////////
-     // boost::foreach::tag
-     //
-@@ -46,6 +51,22 @@ namespace foreach
- 
- } // namespace foreach
- 
-+namespace BOOST_FOREACH
-+{
-+    using foreach::in_range;
-+    using foreach::tag;
-+
-+    template<typename T>
-+    struct is_lightweight_proxy
-+      : foreach::is_lightweight_proxy<T>
-+    {};
-+
-+    template<typename T>
-+    struct is_noncopyable
-+      : foreach::is_noncopyable<T>
-+    {};
-+} // namespace BOOST_FOREACH
-+
- } // namespace boost
- 
- #endif
diff --git a/meta-pkgs/boost/patches/patch-boost_math_tools_config.hpp b/meta-pkgs/boost/patches/patch-boost_math_tools_config.hpp
new file mode 100644
index 00000000000..e737d1b47f1
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-boost_math_tools_config.hpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-boost_math_tools_config.hpp,v 1.1 2013/11/20 19:17:55 adam Exp $
+
+Enable long double math functions on FreeBSD and NetBSD.
+
+--- boost/math/tools/config.hpp.orig	2013-11-20 18:40:34.000000000 +0000
++++ boost/math/tools/config.hpp
+@@ -23,7 +23,7 @@
+ 
+ #include <boost/math/tools/user.hpp>
+ 
+-#if (defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__NetBSD__) \
++#if (defined(__CYGWIN__) \
+    || (defined(__hppa) && !defined(__OpenBSD__)) || (defined(__NO_LONG_DOUBLE_MATH) && (DBL_MANT_DIG != LDBL_MANT_DIG))) \
+    && !defined(BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS)
+ #  define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
diff --git a/meta-pkgs/boost/patches/patch-boost_noncopyable.hpp b/meta-pkgs/boost/patches/patch-boost_noncopyable.hpp
new file mode 100644
index 00000000000..1a919b7f3dc
--- /dev/null
+++ b/meta-pkgs/boost/patches/patch-boost_noncopyable.hpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-boost_noncopyable.hpp,v 1.1 2013/11/20 19:17:55 adam Exp $
+
+https://svn.boost.org/trac/boost/ticket/6578
+
+--- boost/noncopyable.hpp.orig	2013-11-20 14:20:55.000000000 +0000
++++ boost/noncopyable.hpp
+@@ -22,7 +22,7 @@ namespace noncopyable_  // protection fr
+ {
+   class noncopyable
+   {
+-   protected:
++   public:
+ #ifndef BOOST_NO_DEFAULTED_FUNCTIONS
+     BOOST_CONSTEXPR noncopyable() = default;
+     ~noncopyable() = default;