From fa20e8c9bf25edf6c7ebbab154a763e96afe664c Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 7 Nov 2014 19:28:38 +0000 Subject: Chamges 1.57.0: Updated Libraries Any: RTTI is not required any more (TypeIndex library is used for RTTI emulation) Fixed 8958 Asio: Fixed the kqueue reactor so that it works on FreeBSD. Fixed an issue in the kqueue reactor which resulted in spinning when using serial ports on Mac OS. Fixed kqueue reactor support for read-only file descriptors. Fixed a compile error when using the /dev/poll reactor. Changed the Windows backend to use WSASocketW, as WSASocketA has been deprecated. Fixed some warnings reported by Visual C++ 2013. Fixed integer type used in the WinRT version of the byte-order conversion functions. Changed documentation to indicate that use_future and spawn() are not made available when including the asio.hpp convenience header. Explicitly marked asio::strand as deprecated. Use asio::io_service::strand instead. Circular Buffer: Fixed some warnings and move_if_noexcept from Boost.Move is used Config: BOOST_HAS_PRAGMA_DETECT_MISMATCH macro was added Container: Added support for initializer_list. Fixed double destruction bugs in vector and backward expansion capable allocators. Coroutine: optionally register stacks with valgrind 10386 MSVC link error in asymmetric_coroutine.hpp: symbol already defined 10536 call to 'begin(...pull_coroutine< R > & c)' is ambiguous Flyweight: Added serialization support via Boost Serialization. flyweight default constructor was made explicit in Boost 1.56, which introduces a regression in some initialization scenarios. The former non-explicit default constructor has been restored More... --- meta-pkgs/boost/Makefile.common | 36 +++++++++++----------- meta-pkgs/boost/distinfo | 9 +++--- meta-pkgs/boost/options.mk | 14 ++++----- .../patches/patch-boost_variant_static_visitor.hpp | 16 ---------- 4 files changed, 29 insertions(+), 46 deletions(-) delete mode 100644 meta-pkgs/boost/patches/patch-boost_variant_static_visitor.hpp (limited to 'meta-pkgs/boost') diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common index 7bc94df6bcb..43a70ce5498 100644 --- a/meta-pkgs/boost/Makefile.common +++ b/meta-pkgs/boost/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.46 2014/08/18 10:35:13 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.47 2014/11/07 19:28:38 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.56.0 +BOOST_VERSION= 1.57.0 BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//} DISTNAME= boost_${BOOST_VERSION:S/./_/g} @@ -38,11 +38,11 @@ PATCHDIR= ${.CURDIR}/../../meta-pkgs/boost/patches USE_TOOLS+= pax USE_LANGUAGES= c c++ # GCC 4.5 or later is required to build, and GCC 4.5 is not provided for OpenBSD -.if ${OPSYS} == "OpenBSD" +. if ${OPSYS} == "OpenBSD" GCC_REQD+= 4.6 -.else +. else GCC_REQD+= 4.5 -.endif +. endif PLIST_SUBST+= BOOST_VERSION="${BOOST_VERSION}" @@ -59,24 +59,24 @@ SUBST_FILES.darwin= tools/build/src/tools/*darwin.jam SUBST_SED.darwin= -e 's,-install_name ",-install_name "${PREFIX}/lib/,g' # On SunOS, extract using pkgsrc nbtar to avoid warnings from native gtar. -.if ${OPSYS} == "SunOS" +. if ${OPSYS} == "SunOS" TOOLS_PLATFORM.tar= #empty -. include "../../mk/compiler.mk" -. if !empty(CC_VERSION:Mgcc-4.[6-9]*) +. include "../../mk/compiler.mk" +. if !empty(CC_VERSION:Mgcc-4.[6-9]*) BUILDLINK_TRANSFORM+= rename:-D_XOPEN_SOURCE=500:-D_XOPEN_SOURCE=600 -. endif -.endif +. endif +. endif -.if ${OPSYS} == "Darwin" +. if ${OPSYS} == "Darwin" # Prevent using a pkgsrc libtool in OS X because the darwin toolset needs # the native libtool from /Developer/usr/bin or /usr/bin. post-wrapper: -. if exists(/Developer/usr/bin/libtool) +. if exists(/Developer/usr/bin/libtool) ln -s /Developer/usr/bin/libtool ${WRAPPER_BINDIR}/libtool -. else +. else ln -s /usr/bin/libtool ${WRAPPER_BINDIR}/libtool +. endif . endif -.endif # We can't do this at post-extract because the extract cookie will get a future # timestamp than the sources. If this happens, print-PLIST does not work. @@ -85,18 +85,18 @@ pre-configure: # Generate a new user.hpp or use the installed one, depending on the package # we are building. -.if ${BOOST_CONFIG} == "installed" -. include "../../devel/boost-headers/buildlink3.mk" +. if ${BOOST_CONFIG} == "installed" +. include "../../devel/boost-headers/buildlink3.mk" do-configure: ${CP} -f \ ${BUILDLINK_PREFIX.boost-headers}/include/boost/config/user.hpp \ ${WRKSRC}/boost/config/user.hpp -.elif ${BOOST_CONFIG} == "generate" +. elif ${BOOST_CONFIG} == "generate" do-configure: cd ${WRKSRC}/libs/config && \ ${SETENV} ${CONFIGURE_ENV} ${SH} ./configure ${CP} -f ${WRKSRC}/libs/config/user.hpp ${WRKSRC}/boost/config/user.hpp -.endif +. endif boost-install-libs: ${INSTALL_LIB_DIR} ${DESTDIR}${PREFIX}/lib diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index 945bd76108c..f556b128211 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.70 2014/08/18 10:35:13 fhajny Exp $ +$NetBSD: distinfo,v 1.71 2014/11/07 19:28:38 adam Exp $ -SHA1 (boost_1_56_0.tar.bz2) = f94bb008900ed5ba1994a1072140590784b9b5df -RMD160 (boost_1_56_0.tar.bz2) = cef8907987b4187ff913cbf266fd5d99b40137c4 -Size (boost_1_56_0.tar.bz2) = 94777674 bytes +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 (patch-aa) = 408a63a807aaa491130db018cd89bca6a427090d SHA1 (patch-ab) = 37c61bcfc27f1533df21f4392f80df2d2dbe51ef SHA1 (patch-ac) = 32d14b50682dae1950ed927ecb9318ad6b07687a @@ -22,7 +22,6 @@ SHA1 (patch-boost_config_stdlib_libstdcpp3.hpp) = 173271c60b3e2ba7bb1fe9390dcd86 SHA1 (patch-boost_core_noncopyable.hpp) = a693e5eda7fc303e1bd86ecfab40321d771af6fe SHA1 (patch-boost_math_tools_config.hpp) = 81402bc38dc858d0818ed91e204966c8382be4ff SHA1 (patch-boost_regex_config.hpp) = 6b752c7c23168c591cd391739c7a4539bef44c12 -SHA1 (patch-boost_variant_static_visitor.hpp) = fe496c504720d305f868a38fa6309517427c351a SHA1 (patch-libs_config_configure) = e2f204d4fa4f1bd9b4131d28f9be0a1ac22bf711 SHA1 (patch-libs_filesystem_src_unique_path.cpp) = 4693ea11cf464d82168cecaa143b48affa94563b SHA1 (patch-libs_log_src_timestamp.cpp) = f80981762e17ba7d6742f8cf5d8d6d4b494aa54e diff --git a/meta-pkgs/boost/options.mk b/meta-pkgs/boost/options.mk index 08d7f3b72a0..e6454c6ee2f 100644 --- a/meta-pkgs/boost/options.mk +++ b/meta-pkgs/boost/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2013/12/10 16:41:00 jperkin Exp $ +# $NetBSD: options.mk,v 1.3 2014/11/07 19:28:38 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.boost PKG_SUPPORTED_OPTIONS= debug expat icu @@ -11,15 +11,15 @@ PKG_SUGGESTED_OPTIONS= icu .if ${BOOST_PACKAGE} == "libs" -.if !empty(PKG_OPTIONS:Mexpat) +. if !empty(PKG_OPTIONS:Mexpat) MAKE_ENV+= EXPAT_INCLUDE=${PREFIX}/include MAKE_ENV+= EXPAT_LIBPATH=${PREFIX}/lib -. include "../../textproc/expat/buildlink3.mk" -.endif +. include "../../textproc/expat/buildlink3.mk" +. endif -.if !empty(PKG_OPTIONS:Micu) +. if !empty(PKG_OPTIONS:Micu) MAKE_ENV+= ICU_PATH=${PREFIX} -. include "../../textproc/icu/buildlink3.mk" -.endif +. include "../../textproc/icu/buildlink3.mk" +. endif .endif # ${BOOST_PACKAGE} == "libs" diff --git a/meta-pkgs/boost/patches/patch-boost_variant_static_visitor.hpp b/meta-pkgs/boost/patches/patch-boost_variant_static_visitor.hpp deleted file mode 100644 index bbee007bfde..00000000000 --- a/meta-pkgs/boost/patches/patch-boost_variant_static_visitor.hpp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-boost_variant_static_visitor.hpp,v 1.1 2014/08/17 00:10:11 markd Exp $ - -Fix build with gcc 4.5.X -https://github.com/boostorg/variant/commit/8f111d3126c5a706f0eca0b90f5e01c9a4601178 - ---- boost/variant/static_visitor.hpp.orig 2014-08-16 23:31:01.000000000 +0000 -+++ boost/variant/static_visitor.hpp -@@ -48,7 +48,7 @@ public: // typedefs - typedef R result_type; - - protected: // for use as base class only --#ifndef BOOST_NO_DEFAULTED_FUNCTIONS -+#if !defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && !defined(BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS) - static_visitor() = default; - ~static_visitor() = default; - #else -- cgit v1.2.3