diff options
Diffstat (limited to 'meta-pkgs')
| -rw-r--r-- | meta-pkgs/boost/Makefile | 3 | ||||
| -rw-r--r-- | meta-pkgs/boost/Makefile.common | 8 | ||||
| -rw-r--r-- | meta-pkgs/boost/distinfo | 14 | ||||
| -rw-r--r-- | meta-pkgs/boost/patches/patch-boost_asio_detail_config.hpp | 20 | ||||
| -rw-r--r-- | meta-pkgs/boost/patches/patch-boost_config_stdlib_libstdcpp3.hpp | 14 | ||||
| -rw-r--r-- | meta-pkgs/boost/patches/patch-boost_intrusive_circular__list__algorithms.hpp | 13 | ||||
| -rw-r--r-- | meta-pkgs/boost/patches/patch-libs_log_src_timestamp.cpp | 13 |
7 files changed, 25 insertions, 60 deletions
diff --git a/meta-pkgs/boost/Makefile b/meta-pkgs/boost/Makefile index 0165b2bbe4c..8a2aca252c3 100644 --- a/meta-pkgs/boost/Makefile +++ b/meta-pkgs/boost/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.15 2015/04/06 08:17:32 adam Exp $ +# $NetBSD: Makefile,v 1.16 2015/04/17 14:04:47 adam Exp $ BOOST_PACKAGE= meta-pkg BOOST_COMMENT= (meta package) META_PACKAGE= yes -PKGREVISION= 1 .include "Makefile.common" BOOST_DEPENDS_VERSION= ${BOOST_SHORT_VERSION:S/_/./}{,nb*,.*} diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common index fda7a0ad29b..6196741cf75 100644 --- a/meta-pkgs/boost/Makefile.common +++ b/meta-pkgs/boost/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.50 2015/04/14 09:06:32 jperkin Exp $ +# $NetBSD: Makefile.common,v 1.51 2015/04/17 14:04:47 adam Exp $ # # used by devel/boost-build/Makefile # used by devel/boost-docs/Makefile @@ -9,7 +9,7 @@ BOOST_PACKAGE?= undefined BOOST_COMMENT?= undefined -BOOST_VERSION= 1.57.0 +BOOST_VERSION= 1.58.0 BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//} DISTNAME= boost_${BOOST_VERSION:S/./_/g} @@ -76,10 +76,14 @@ post-wrapper: ${RM} -f ${WRAPPER_BINDIR}/libtool ${CWRAPPERS_BIN_DIR}/libtool . if exists(/Developer/usr/bin/libtool) ${LN} -s /Developer/usr/bin/libtool ${WRAPPER_BINDIR}/libtool +. if !empty(CWRAPPERS_BIN_DIR) ${LN} -s /Developer/usr/bin/libtool ${CWRAPPERS_BIN_DIR}/libtool +. endif . else ${LN} -s /usr/bin/libtool ${WRAPPER_BINDIR}/libtool +. if !empty(CWRAPPERS_BIN_DIR) ${LN} -s /usr/bin/libtool ${CWRAPPERS_BIN_DIR}/libtool +. endif . endif . endif diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index 63ff50449fa..f39420f4fda 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.76 2015/02/02 07:47:56 jdc Exp $ +$NetBSD: distinfo,v 1.77 2015/04/17 14:04:47 adam Exp $ -SHA1 (boost_1_57_0.tar.bz2) = e151557ae47afd1b43dc3fac46f8b04a8fe51c12 -RMD160 (boost_1_57_0.tar.bz2) = 8365f7c11e5ae088164ab1cb40ac624e76f8e72e -Size (boost_1_57_0.tar.bz2) = 60821561 bytes +SHA1 (boost_1_58_0.tar.bz2) = 2fc96c1651ac6fe9859b678b165bd78dc211e881 +RMD160 (boost_1_58_0.tar.bz2) = efc78b2b1a5d33ed72fcfa6688564c2fcd56772a +Size (boost_1_58_0.tar.bz2) = 70394057 bytes SHA1 (patch-aa) = 408a63a807aaa491130db018cd89bca6a427090d SHA1 (patch-ab) = 37c61bcfc27f1533df21f4392f80df2d2dbe51ef SHA1 (patch-ac) = 32d14b50682dae1950ed927ecb9318ad6b07687a @@ -11,16 +11,14 @@ SHA1 (patch-ae) = ac2e4afcf243c2fee2394cfe3fe92f4890e9ab83 SHA1 (patch-ag) = 117eabbbbc26d04bb5e56df5ad92e55b5061c0f8 SHA1 (patch-aq) = 355a58864bf4d07617250d2587e0f7cf62a7b825 SHA1 (patch-ar) = 2fec2c51272cc4ee376e6538d8f1fd8561a7f0a3 -SHA1 (patch-boost_asio_detail_config.hpp) = b95ca6b0bb6c805624cb81c91c3f1b691a7425ca SHA1 (patch-boost_config_posix__features.hpp) = c3e7187af35a2a25901b37388d3194e22d005323 SHA1 (patch-boost_config_stdlib_libcpp.hpp) = d243325d3aeb180e4ed7a1fd7d89782d832fa9fc -SHA1 (patch-boost_config_stdlib_libstdcpp3.hpp) = 173271c60b3e2ba7bb1fe9390dcd864ce9742588 +SHA1 (patch-boost_config_stdlib_libstdcpp3.hpp) = 52ebedd5e80b3a8c257eccb28cd2db76cb1ca01e SHA1 (patch-boost_core_noncopyable.hpp) = a693e5eda7fc303e1bd86ecfab40321d771af6fe -SHA1 (patch-boost_intrusive_circular__list__algorithms.hpp) = 0d54a9e37ead1648710ae0f8f71830bfaec10764 SHA1 (patch-boost_math_tools_config.hpp) = 81402bc38dc858d0818ed91e204966c8382be4ff SHA1 (patch-boost_regex_config.hpp) = 6b752c7c23168c591cd391739c7a4539bef44c12 SHA1 (patch-libs_config_configure) = e2f204d4fa4f1bd9b4131d28f9be0a1ac22bf711 SHA1 (patch-libs_context_build_Jamfile.v2) = befc2ae62e893ac665e88405d6aca79712f2549b SHA1 (patch-libs_context_src_asm_make__ppc32__sysv__macho__gas.S) = 7f598bc270fcfa8babd99e1180248f04b50c2e46 SHA1 (patch-libs_filesystem_src_unique_path.cpp) = 4693ea11cf464d82168cecaa143b48affa94563b -SHA1 (patch-libs_log_src_timestamp.cpp) = f80981762e17ba7d6742f8cf5d8d6d4b494aa54e +SHA1 (patch-libs_log_src_timestamp.cpp) = b6bb7a29467c64f81dafd06039ab3a1842844845 diff --git a/meta-pkgs/boost/patches/patch-boost_asio_detail_config.hpp b/meta-pkgs/boost/patches/patch-boost_asio_detail_config.hpp deleted file mode 100644 index 1929dcee4f2..00000000000 --- a/meta-pkgs/boost/patches/patch-boost_asio_detail_config.hpp +++ /dev/null @@ -1,20 +0,0 @@ -$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_config_stdlib_libstdcpp3.hpp b/meta-pkgs/boost/patches/patch-boost_config_stdlib_libstdcpp3.hpp index 9ca2890df7e..e4557af1fd8 100644 --- a/meta-pkgs/boost/patches/patch-boost_config_stdlib_libstdcpp3.hpp +++ b/meta-pkgs/boost/patches/patch-boost_config_stdlib_libstdcpp3.hpp @@ -1,18 +1,16 @@ -$NetBSD: patch-boost_config_stdlib_libstdcpp3.hpp,v 1.1 2014/03/16 04:40:25 ryoon Exp $ +$NetBSD: patch-boost_config_stdlib_libstdcpp3.hpp,v 1.2 2015/04/17 14:04:47 adam Exp $ * Fix build under NetBSD with GCC 4.8.3 in base. GCC 4.8.3 does not define _GLIBCXX_HAVE_GTHR_DEFAULT in /usr/include/g++/bits/c++config.h. ---- boost/config/stdlib/libstdcpp3.hpp.orig 2014-03-08 14:33:38.000000000 +0000 +--- boost/config/stdlib/libstdcpp3.hpp.orig 2015-03-24 18:27:48.000000000 +0000 +++ boost/config/stdlib/libstdcpp3.hpp -@@ -36,7 +36,8 @@ - || defined(_GLIBCXX__PTHREADS) \ +@@ -37,6 +37,7 @@ || defined(_GLIBCXX_HAS_GTHREADS) \ || defined(_WIN32) \ -- || defined(_AIX) -+ || defined(_AIX) \ -+ || defined(__NetBSD__) + || defined(_AIX) \ ++ || defined(__NetBSD__) \ + || defined(__HAIKU__) // // If the std lib has thread support turned on, then turn it on in Boost - // as well. We do this because some gcc-3.4 std lib headers define _REENTANT diff --git a/meta-pkgs/boost/patches/patch-boost_intrusive_circular__list__algorithms.hpp b/meta-pkgs/boost/patches/patch-boost_intrusive_circular__list__algorithms.hpp deleted file mode 100644 index 396f74d87bb..00000000000 --- a/meta-pkgs/boost/patches/patch-boost_intrusive_circular__list__algorithms.hpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-boost_intrusive_circular__list__algorithms.hpp,v 1.1 2015/01/15 13:01:44 joerg Exp $ - ---- boost/intrusive/circular_list_algorithms.hpp.orig 2015-01-13 12:09:16.000000000 +0000 -+++ boost/intrusive/circular_list_algorithms.hpp -@@ -475,7 +475,7 @@ class circular_list_algorithms - BOOST_CATCH(...){ - node_traits::set_next (last_to_remove, new_f); - node_traits::set_previous(new_f, last_to_remove); -- throw; -+ BOOST_RETHROW - } - BOOST_CATCH_END - node_traits::set_next(last_to_remove, new_f); diff --git a/meta-pkgs/boost/patches/patch-libs_log_src_timestamp.cpp b/meta-pkgs/boost/patches/patch-libs_log_src_timestamp.cpp index 7cbdf2861ae..fd34c4fc9b3 100644 --- a/meta-pkgs/boost/patches/patch-libs_log_src_timestamp.cpp +++ b/meta-pkgs/boost/patches/patch-libs_log_src_timestamp.cpp @@ -1,15 +1,14 @@ -$NetBSD: patch-libs_log_src_timestamp.cpp,v 1.1 2014/05/13 18:48:49 ryoon Exp $ +$NetBSD: patch-libs_log_src_timestamp.cpp,v 1.2 2015/04/17 14:04:47 adam Exp $ * OpenBSD 5.5 has no _POSIX_TIMES, fix build under OpenBSD 5.5 ---- libs/log/src/timestamp.cpp.orig 2013-08-25 14:20:22.000000000 +0000 +--- libs/log/src/timestamp.cpp.orig 2015-04-04 17:33:00.000000000 +0000 +++ libs/log/src/timestamp.cpp -@@ -202,7 +202,7 @@ BOOST_LOG_API get_tick_count_t get_tick_ - +@@ -203,6 +203,7 @@ BOOST_LOG_API get_tick_count_t get_tick_ #endif // _WIN32_WINNT >= 0x0600 --#elif defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 -+#elif (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) || defined(__OpenBSD__) + #elif (defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0) /* POSIX timers supported */ \ ++ || defined(__OpenBSD__) \ + || defined(__GNU__) /* GNU Hurd does not support POSIX timers fully but does provide clock_gettime() */ BOOST_LOG_API int64_t duration::milliseconds() const - { |