diff --git a/meta-pkgs/boost/Makefile.common b/meta-pkgs/boost/Makefile.common index 8d588f8b36cb..c76a673768bb 100644 --- a/meta-pkgs/boost/Makefile.common +++ b/meta-pkgs/boost/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.100 2024/04/17 16:14:01 adam Exp $ +# $NetBSD: Makefile.common,v 1.101 2024/10/04 03:26:53 ryoon 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.85.0 +BOOST_VERSION= 1.86.0 BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//} DISTNAME= boost_${BOOST_VERSION:S/./_/g} diff --git a/meta-pkgs/boost/distinfo b/meta-pkgs/boost/distinfo index 736ac6759dd0..5184be071fc7 100644 --- a/meta-pkgs/boost/distinfo +++ b/meta-pkgs/boost/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.150 2024/08/06 09:54:56 adam Exp $ +$NetBSD: distinfo,v 1.151 2024/10/04 03:26:54 ryoon Exp $ -BLAKE2s (boost_1_85_0.tar.bz2) = ed6d31f08fd41a929d85dd69e02f83e4066ef5435548c1472aa3004247e8eb9b -SHA512 (boost_1_85_0.tar.bz2) = b4489813a4192b57626589457932338cfc47c4ec05c19b3a58b2d8df9e95f022ff2f5f452811ff82d1cec4fb0a490e991c8825bad0fb5a81318d07a8788d8ca0 -Size (boost_1_85_0.tar.bz2) = 124015250 bytes +BLAKE2s (boost_1_86_0.tar.bz2) = 26848a10932e8c538670d04376441a289846d2c7394c9da7b0332106e4f1b52c +SHA512 (boost_1_86_0.tar.bz2) = 9f8144e07a44cc5b5be6c6da17b2e6f29f0637dda345764c89eac0bcb9ce2878469a7e6fcd2c96d25034937025768450b33fc14fb40470fa4806bfcf03330e75 +Size (boost_1_86_0.tar.bz2) = 126220652 bytes SHA1 (patch-boost_archive_basic__archive.hpp) = 1f809170538f83252dc2f368825622f7a9df96f9 SHA1 (patch-boost_asio_detail_config.hpp) = bbe043f74424c4f218308a1cefab73cb289f7b3f -SHA1 (patch-boost_charconv_detail_config.hpp) = 2fc0e4910afafd20379979abf473630479efd17f SHA1 (patch-boost_config_detail_posix__features.hpp) = 7d310574e7020c79c8bfa87cff4db0a2edc5b0bc SHA1 (patch-boost_config_detail_suffix.hpp) = 12e22085e7c292b2451ea8bc581beaddcb936252 SHA1 (patch-boost_config_platform_bsd.hpp) = 7fb633809dcb4ac1c76d9f43fb4e9e288a83ff34 @@ -19,7 +18,6 @@ SHA1 (patch-boost_math_special__functions_log1p.hpp) = df6fd088da736a4640663b648 SHA1 (patch-boost_math_tools_config.hpp) = a4fa3cab1c5fa4a12b95bbbc99bc65d6406b4f50 SHA1 (patch-boost_math_tools_promotion.hpp) = 038dca671e58e2874b0e436638054e9b97b0fb41 SHA1 (patch-boost_numeric_ublas_storage.hpp) = 282b5a3b5d09216ded14fae166169d64db72590e -SHA1 (patch-boost_process_detail_posix_is__running.hpp) = cc9084735774bd33c5ff6ff936a039fa30f989dd SHA1 (patch-boost_property__tree_detail_xml__parser__read__rapidxml.hpp) = 3499fcc37e72396d23a9fce0f1c97891adf12a9f SHA1 (patch-boost_stacktrace_detail_collect__unwind.ipp) = a5922dffd929f596b6e7d71b11f32d17e0bbd806 SHA1 (patch-boost_test_impl_execution__monitor.ipp) = ffd449576d00b7e6ea3081421e3e70decf5d7de8 @@ -31,6 +29,9 @@ SHA1 (patch-libs_context_src_asm_jump_arm_aapcs_elf_gas.S) = daaa70c31f2ebc2c357 SHA1 (patch-libs_context_src_asm_ontop_arm_aapcs_elf_gas.S) = f4e9912a3101f10a3f7ac0151aac957f80fdc9cc SHA1 (patch-libs_fiber_build_Jamfile.v2) = 4b4a6698111042a3e54dc181b555516e0685796d SHA1 (patch-libs_filesystem_src_directory.cpp) = ec0ee191ae0ebc2324acef3e1cb7e471b904d620 +SHA1 (patch-libs_process_src_ext_cmd.cpp) = 72d68b6d9a65124b73986b695cf8866d6f280ecb +SHA1 (patch-libs_process_src_ext_exe.cpp) = 9e49eb8d4b48362a23bc49bce1006d0b3a53d308 +SHA1 (patch-libs_process_src_posix_close__handles.cpp) = 63d6de8c3c22fd7513307077d8f267e55416b561 SHA1 (patch-libs_python_src_numpy_dtype.cpp) = 4c8cc12addfb6f42d534729cce0ed77ac84ae56f SHA1 (patch-tools_build_src_engine_build.sh) = 7a756f04a2f11fd06bfa69c5d8ad160926f7da95 SHA1 (patch-tools_build_src_tools_gcc.jam) = 4d895f14965ee29e328dda15e9975ccc1c14673f diff --git a/meta-pkgs/boost/patches/patch-boost_charconv_detail_config.hpp b/meta-pkgs/boost/patches/patch-boost_charconv_detail_config.hpp deleted file mode 100644 index 5ec709254c66..000000000000 --- a/meta-pkgs/boost/patches/patch-boost_charconv_detail_config.hpp +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-boost_charconv_detail_config.hpp,v 1.2 2024/07/06 08:53:57 cheusov Exp $ - ---- boost/charconv/detail/config.hpp.orig 2024-04-18 00:33:06.932281929 +0000 -+++ boost/charconv/detail/config.hpp -@@ -27,7 +27,7 @@ - # define BOOST_CHARCONV_UINT128_MAX (2 * static_cast(BOOST_CHARCONV_INT128_MAX) + 1) - #endif - --#if defined(BOOST_HAS_FLOAT128) && !defined(__STRICT_ANSI__) && !defined(BOOST_CHARCONV_NO_QUADMATH) -+#if defined(BOOST_HAS_FLOAT128) && !defined(__STRICT_ANSI__) && !defined(BOOST_CHARCONV_NO_QUADMATH) && !defined(__NetBSD__) && !defined(__GLIBC__) - # define BOOST_CHARCONV_HAS_FLOAT128 - # include - #endif diff --git a/meta-pkgs/boost/patches/patch-boost_process_detail_posix_is__running.hpp b/meta-pkgs/boost/patches/patch-boost_process_detail_posix_is__running.hpp deleted file mode 100644 index ae51c946f568..000000000000 --- a/meta-pkgs/boost/patches/patch-boost_process_detail_posix_is__running.hpp +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-boost_process_detail_posix_is__running.hpp,v 1.1 2020/09/09 06:38:52 tnn Exp $ - -Cannot use static asserts on WIFEXITED() & friends because the -internal _W_INT macro uses (void*) which is not allowed in constexprs. - ---- boost/process/detail/posix/is_running.hpp.orig 2020-04-22 13:35:49.000000000 +0000 -+++ boost/process/detail/posix/is_running.hpp -@@ -17,10 +17,12 @@ namespace boost { namespace process { na - // This bit arrangement of status codes is not guaranteed by POSIX, but (according to comments in - // the glibc header) is the same across systems in practice. - constexpr int still_active = 0x017f; -+#if !defined(__NetBSD__) - static_assert(WIFSTOPPED(still_active), "Expected still_active to indicate WIFSTOPPED"); - static_assert(!WIFEXITED(still_active), "Expected still_active to not indicate WIFEXITED"); - static_assert(!WIFSIGNALED(still_active), "Expected still_active to not indicate WIFSIGNALED"); - static_assert(!WIFCONTINUED(still_active), "Expected still_active to not indicate WIFCONTINUED"); -+#endif - - inline bool is_running(int code) - { diff --git a/meta-pkgs/boost/patches/patch-libs_process_src_ext_cmd.cpp b/meta-pkgs/boost/patches/patch-libs_process_src_ext_cmd.cpp new file mode 100644 index 000000000000..ee413b47ebfa --- /dev/null +++ b/meta-pkgs/boost/patches/patch-libs_process_src_ext_cmd.cpp @@ -0,0 +1,32 @@ +$NetBSD: patch-libs_process_src_ext_cmd.cpp,v 1.1 2024/10/04 03:26:54 ryoon Exp $ + +* Fix conversion error under NetBSD. + +--- libs/process/src/ext/cmd.cpp.orig 2024-09-04 03:57:14.583580599 +0000 ++++ libs/process/src/ext/cmd.cpp +@@ -299,7 +299,6 @@ shell cmd(boost::process::v2::pid_type p + shell cmd(boost::process::v2::pid_type pid, boost::system::error_code & ec) + { + +- std::vector vec; + int cntp = 0; + kinfo_proc2 *proc_info = nullptr; + struct closer +@@ -312,7 +311,7 @@ shell cmd(boost::process::v2::pid_type p + + std::unique_ptr kd{kvm_openfiles(nullptr, nullptr, nullptr, KVM_NO_FILES, nullptr)}; + +- if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec) return vec;} ++ if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec) return {};} + if ((proc_info = kvm_getproc2(kd.get(), KERN_PROC_PID, pid, sizeof(struct kinfo_proc2), &cntp))) + { + char **cmd = kvm_getargv2(kd.get(), proc_info, 0); +@@ -323,7 +322,7 @@ shell cmd(boost::process::v2::pid_type p + } + else + BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec) +- return vec; ++ return {}; + } + + #elif defined(__OpenBSD__) diff --git a/meta-pkgs/boost/patches/patch-libs_process_src_ext_exe.cpp b/meta-pkgs/boost/patches/patch-libs_process_src_ext_exe.cpp new file mode 100644 index 000000000000..b1ce0bd5a9f2 --- /dev/null +++ b/meta-pkgs/boost/patches/patch-libs_process_src_ext_exe.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-libs_process_src_ext_exe.cpp,v 1.1 2024/10/04 03:26:54 ryoon Exp $ + +* NetBSD has no alloca.h. + +--- libs/process/src/ext/exe.cpp.orig 2024-09-04 03:41:50.439541344 +0000 ++++ libs/process/src/ext/exe.cpp +@@ -36,7 +36,7 @@ + #if (defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)) + #include + #include +-#if !defined(__FreeBSD__) ++#if !defined(__FreeBSD__) && !defined(__NetBSD__) + #include + #endif + #endif diff --git a/meta-pkgs/boost/patches/patch-libs_process_src_posix_close__handles.cpp b/meta-pkgs/boost/patches/patch-libs_process_src_posix_close__handles.cpp new file mode 100644 index 000000000000..bdd69575f371 --- /dev/null +++ b/meta-pkgs/boost/patches/patch-libs_process_src_posix_close__handles.cpp @@ -0,0 +1,32 @@ +$NetBSD: patch-libs_process_src_posix_close__handles.cpp,v 1.1 2024/10/04 03:26:54 ryoon Exp $ + +* NetBSD has no close_range and closefrom. +* dirfd is a macro for NetBSD. + +--- libs/process/src/posix/close_handles.cpp.orig 2024-08-07 22:07:40.000000000 +0000 ++++ libs/process/src/posix/close_handles.cpp +@@ -17,7 +17,7 @@ + // linux has close_range since 5.19 + + +-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) + + // https://www.freebsd.org/cgi/man.cgi?query=close_range&apropos=0&sektion=0&manpath=FreeBSD+13.1-RELEASE+and+Ports&arch=default&format=html + // https://man.netbsd.org/closefrom.3 +@@ -185,7 +185,7 @@ void close_all(const std::vector & + return ; + } + +- auto dir_fd = ::dirfd(dir.get()); ++ auto dir_fd = dirfd(dir.get()); + if (dir_fd == -1) + { + ec = BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error(); +@@ -219,4 +219,4 @@ void close_all(const std::vector & + + BOOST_PROCESS_V2_END_NAMESPACE + +-#endif +\ No newline at end of file ++#endif