pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/meta-pkgs/boost
Module Name: pkgsrc
Committed By: jperkin
Date: Thu Oct 10 14:44:17 UTC 2024
Modified Files:
pkgsrc/meta-pkgs/boost: Makefile.common distinfo
pkgsrc/meta-pkgs/boost/patches: patch-libs_process_src_ext_cmd.cpp
patch-libs_process_src_ext_exe.cpp
Added Files:
pkgsrc/meta-pkgs/boost/patches: patch-boost_process_v2_pid.hpp
patch-boost_process_v2_posix_default__launcher.hpp
patch-libs_charconv_src_float128__impl.hpp
patch-libs_process_src_ext_cwd.cpp patch-libs_process_src_pid.cpp
Log Message:
boost: Various SunOS fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/meta-pkgs/boost/Makefile.common
cvs rdiff -u -r1.151 -r1.152 pkgsrc/meta-pkgs/boost/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/meta-pkgs/boost/patches/patch-boost_process_v2_pid.hpp \
pkgsrc/meta-pkgs/boost/patches/patch-boost_process_v2_posix_default__launcher.hpp \
pkgsrc/meta-pkgs/boost/patches/patch-libs_charconv_src_float128__impl.hpp \
pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_cwd.cpp \
pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_pid.cpp
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_cmd.cpp \
pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_exe.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/meta-pkgs/boost/Makefile.common
diff -u pkgsrc/meta-pkgs/boost/Makefile.common:1.101 pkgsrc/meta-pkgs/boost/Makefile.common:1.102
--- pkgsrc/meta-pkgs/boost/Makefile.common:1.101 Fri Oct 4 03:26:53 2024
+++ pkgsrc/meta-pkgs/boost/Makefile.common Thu Oct 10 14:44:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.101 2024/10/04 03:26:53 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.102 2024/10/10 14:44:17 jperkin Exp $
#
# used by devel/boost-build/Makefile
# used by devel/boost-docs/Makefile
@@ -55,7 +55,6 @@ SUBST_SED.darwin= -e 's,darwin : @rpath/
# On SunOS, extract using pkgsrc nbtar to avoid warnings from native gtar.
. if ${OPSYS} == "SunOS"
TOOLS_PLATFORM.tar= #empty
-BUILDLINK_TRANSFORM+= opt:-D_XOPEN_SOURCE=500:-D_XOPEN_SOURCE=600
. endif
. if ${OPSYS} == "Darwin"
Index: pkgsrc/meta-pkgs/boost/distinfo
diff -u pkgsrc/meta-pkgs/boost/distinfo:1.151 pkgsrc/meta-pkgs/boost/distinfo:1.152
--- pkgsrc/meta-pkgs/boost/distinfo:1.151 Fri Oct 4 03:26:54 2024
+++ pkgsrc/meta-pkgs/boost/distinfo Thu Oct 10 14:44:17 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.151 2024/10/04 03:26:54 ryoon Exp $
+$NetBSD: distinfo,v 1.152 2024/10/10 14:44:17 jperkin Exp $
BLAKE2s (boost_1_86_0.tar.bz2) = 26848a10932e8c538670d04376441a289846d2c7394c9da7b0332106e4f1b52c
SHA512 (boost_1_86_0.tar.bz2) = 9f8144e07a44cc5b5be6c6da17b2e6f29f0637dda345764c89eac0bcb9ce2878469a7e6fcd2c96d25034937025768450b33fc14fb40470fa4806bfcf03330e75
@@ -18,19 +18,24 @@ SHA1 (patch-boost_math_special__function
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_v2_pid.hpp) = 46c54fdc2ac8329698e4c0c6c0aa551dd92301e7
+SHA1 (patch-boost_process_v2_posix_default__launcher.hpp) = d38c847ff4f0326252041aaa6ae25b6957d37d25
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
SHA1 (patch-boost_thread_pthread_thread__data.hpp) = d048867f0ed98720cc375e949e5c92b92f3ce1ac
SHA1 (patch-boostcpp.jam) = c545980fc72ce5a9fd2463899280927b495771b9
+SHA1 (patch-libs_charconv_src_float128__impl.hpp) = ea8598030c13c5c5c7acc07c1996dbea7f9e9c6f
SHA1 (patch-libs_config_configure) = e2f204d4fa4f1bd9b4131d28f9be0a1ac22bf711
SHA1 (patch-libs_config_test_boost__no__range__based__for.ipp) = d9936c472fc2c696d86522b36eb12813ae91bee4
SHA1 (patch-libs_context_src_asm_jump_arm_aapcs_elf_gas.S) = daaa70c31f2ebc2c357e467585e0b5c6f70963cc
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_ext_cmd.cpp) = c329d4d0b8684068aed4786a79f56b554862cf1a
+SHA1 (patch-libs_process_src_ext_cwd.cpp) = 43720c8bb60548cf6a5b17449594e97441c04be8
+SHA1 (patch-libs_process_src_ext_exe.cpp) = 98c7ba0a630783ee01a377fb8e98344af2e3236a
+SHA1 (patch-libs_process_src_pid.cpp) = af152015ef596e31171f19a115a1187e0c16fe70
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
Index: pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_cmd.cpp
diff -u pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_cmd.cpp:1.1 pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_cmd.cpp:1.2
--- pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_cmd.cpp:1.1 Fri Oct 4 03:26:54 2024
+++ pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_cmd.cpp Thu Oct 10 14:44:17 2024
@@ -1,8 +1,9 @@
-$NetBSD: patch-libs_process_src_ext_cmd.cpp,v 1.1 2024/10/04 03:26:54 ryoon Exp $
+$NetBSD: patch-libs_process_src_ext_cmd.cpp,v 1.2 2024/10/10 14:44:17 jperkin Exp $
* Fix conversion error under NetBSD.
+* Fix SunOS backend.
---- libs/process/src/ext/cmd.cpp.orig 2024-09-04 03:57:14.583580599 +0000
+--- libs/process/src/ext/cmd.cpp.orig 2024-10-10 11:51:53.957542478 +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)
@@ -30,3 +31,45 @@ $NetBSD: patch-libs_process_src_ext_cmd.
}
#elif defined(__OpenBSD__)
+@@ -365,20 +364,28 @@ shell cmd(boost::process::v2::pid_type p
+ char **cmd = nullptr;
+ proc *proc_info = nullptr;
+ user *proc_user = nullptr;
+- kd = kvm_open(nullptr, nullptr, nullptr, O_RDONLY, nullptr);
++ struct closer
++ {
++ void operator()(kvm_t * kd)
++ {
++ kvm_close(kd);
++ }
++ };
++
++ std::unique_ptr<kvm_t, closer> kd{kvm_open(nullptr, nullptr, nullptr, O_RDONLY, nullptr)};
+ if (!kd) {BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec) return {};}
+- if ((proc_info = kvm_getproc(kd, pid)))
++ if ((proc_info = kvm_getproc(kd.get(), pid)))
+ {
+- if ((proc_user = kvm_getu(kd, proc_info)))
++ if ((proc_user = kvm_getu(kd.get(), proc_info)))
+ {
+- if (!kvm_getcmd(kd, proc_info, proc_user, &cmd, nullptr))
++ if (!kvm_getcmd(kd.get(), proc_info, proc_user, &cmd, nullptr))
+ {
+ int argc = 0;
+ for (int i = 0; cmd[i] != nullptr; i++)
+ argc ++;
+ return make_cmd_shell_::make(
+ {}, argc, cmd,
+- +[](int, char ** argv) {::free(argv);})
++ +[](int, char ** argv) {::free(argv);});
+ }
+ else
+ BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
+@@ -389,7 +396,6 @@ shell cmd(boost::process::v2::pid_type p
+ else
+ BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
+
+- kvm_close(kd);
+ return {};
+ }
+
Index: pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_exe.cpp
diff -u pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_exe.cpp:1.1 pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_exe.cpp:1.2
--- pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_exe.cpp:1.1 Fri Oct 4 03:26:54 2024
+++ pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_exe.cpp Thu Oct 10 14:44:17 2024
@@ -1,8 +1,9 @@
-$NetBSD: patch-libs_process_src_ext_exe.cpp,v 1.1 2024/10/04 03:26:54 ryoon Exp $
+$NetBSD: patch-libs_process_src_ext_exe.cpp,v 1.2 2024/10/10 14:44:17 jperkin Exp $
* NetBSD has no alloca.h.
+* Spell filesystem correctly.
---- libs/process/src/ext/exe.cpp.orig 2024-09-04 03:41:50.439541344 +0000
+--- libs/process/src/ext/exe.cpp.orig 2024-10-10 11:51:53.957585105 +0000
+++ libs/process/src/ext/exe.cpp
@@ -36,7 +36,7 @@
#if (defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__))
@@ -13,3 +14,12 @@ $NetBSD: patch-libs_process_src_ext_exe.
#include <alloca.h>
#endif
#endif
+@@ -135,7 +135,7 @@ filesystem::path exe(boost::process::v2:
+ filesystem::path("/proc") / std::to_string(pid) / "exe", ec
+ );
+ #elif defined(__sun)
+- return fileystem::canonical(
++ return filesystem::canonical(
+ filesystem::path("/proc") / std::to_string(pid) / "path/a.out", ec
+ );
+ #endif
Added files:
Index: pkgsrc/meta-pkgs/boost/patches/patch-boost_process_v2_pid.hpp
diff -u /dev/null pkgsrc/meta-pkgs/boost/patches/patch-boost_process_v2_pid.hpp:1.1
--- /dev/null Thu Oct 10 14:44:17 2024
+++ pkgsrc/meta-pkgs/boost/patches/patch-boost_process_v2_pid.hpp Thu Oct 10 14:44:17 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-boost_process_v2_pid.hpp,v 1.1 2024/10/10 14:44:17 jperkin Exp $
+
+Needs memory for std::unique_ptr.
+
+--- boost/process/v2/pid.hpp.orig 2024-10-10 13:05:20.901616091 +0000
++++ boost/process/v2/pid.hpp
+@@ -9,6 +9,7 @@
+ #include <boost/process/v2/detail/config.hpp>
+ #include <boost/process/v2/detail/throw_error.hpp>
+
++#include <memory>
+ #include <vector>
+
+ BOOST_PROCESS_V2_BEGIN_NAMESPACE
Index: pkgsrc/meta-pkgs/boost/patches/patch-boost_process_v2_posix_default__launcher.hpp
diff -u /dev/null pkgsrc/meta-pkgs/boost/patches/patch-boost_process_v2_posix_default__launcher.hpp:1.1
--- /dev/null Thu Oct 10 14:44:17 2024
+++ pkgsrc/meta-pkgs/boost/patches/patch-boost_process_v2_posix_default__launcher.hpp Thu Oct 10 14:44:17 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-boost_process_v2_posix_default__launcher.hpp,v 1.1 2024/10/10 14:44:17 jperkin Exp $
+
+Fix SunOS.
+
+--- boost/process/v2/posix/default_launcher.hpp.orig 2024-10-10 13:01:55.403121250 +0000
++++ boost/process/v2/posix/default_launcher.hpp
+@@ -29,7 +29,7 @@
+ #include <unistd.h>
+
+
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__MACH__)
++#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__MACH__) || defined(__sun)
+ extern "C" { extern char **environ; }
+ #endif
+
Index: pkgsrc/meta-pkgs/boost/patches/patch-libs_charconv_src_float128__impl.hpp
diff -u /dev/null pkgsrc/meta-pkgs/boost/patches/patch-libs_charconv_src_float128__impl.hpp:1.1
--- /dev/null Thu Oct 10 14:44:17 2024
+++ pkgsrc/meta-pkgs/boost/patches/patch-libs_charconv_src_float128__impl.hpp Thu Oct 10 14:44:17 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-libs_charconv_src_float128__impl.hpp,v 1.1 2024/10/10 14:44:17 jperkin Exp $
+
+Workaround system header issue on SunOS.
+
+--- libs/charconv/src/float128_impl.hpp.orig 2024-10-10 14:05:35.495301016 +0000
++++ libs/charconv/src/float128_impl.hpp
+@@ -92,7 +92,11 @@ inline __float128 to_float128(Unsigned_I
+ template <>
+ inline __float128 to_float128<uint128>(uint128 w) noexcept
+ {
++#ifdef __sun
++ return ldexpq(static_cast<__float128>(w.high), 64) + static_cast<__float128>(w.low);
++#else
+ return ldexp(static_cast<__float128>(w.high), 64) + static_cast<__float128>(w.low);
++#endif
+ }
+
+ template <typename Unsigned_Integer, typename ArrayPtr>
Index: pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_cwd.cpp
diff -u /dev/null pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_cwd.cpp:1.1
--- /dev/null Thu Oct 10 14:44:17 2024
+++ pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_ext_cwd.cpp Thu Oct 10 14:44:17 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-libs_process_src_ext_cwd.cpp,v 1.1 2024/10/10 14:44:17 jperkin Exp $
+
+Spell filesystem correctly.
+
+--- libs/process/src/ext/cwd.cpp.orig 2024-10-10 13:24:36.777254793 +0000
++++ libs/process/src/ext/cwd.cpp
+@@ -119,7 +119,7 @@ filesystem::path cwd(boost::process::v2:
+ filesystem::path("/proc") / std::to_string(pid) / "cwd", ec
+ );
+ #elif defined(__sun)
+- return fileystem::canonical(
++ return filesystem::canonical(
+ filesystem::path("/proc") / std::to_string(pid) / "path/cwd", ec
+ );
+ #endif
Index: pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_pid.cpp
diff -u /dev/null pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_pid.cpp:1.1
--- /dev/null Thu Oct 10 14:44:17 2024
+++ pkgsrc/meta-pkgs/boost/patches/patch-libs_process_src_pid.cpp Thu Oct 10 14:44:17 2024
@@ -0,0 +1,64 @@
+$NetBSD: patch-libs_process_src_pid.cpp,v 1.1 2024/10/10 14:44:17 jperkin Exp $
+
+Fix SunOS backend.
+
+--- libs/process/src/pid.cpp.orig 2024-10-10 13:29:12.831306066 +0000
++++ libs/process/src/pid.cpp
+@@ -53,6 +53,7 @@
+ #include <sys/param.h>
+ #include <sys/time.h>
+ #include <sys/proc.h>
++#include <fcntl.h>
+ #endif
+
+ BOOST_PROCESS_V2_BEGIN_NAMESPACE
+@@ -640,16 +641,16 @@ std::vector<pid_type> all_pids(boost::sy
+ kvm_close(kd);
+ }
+ };
+-
+ std::unique_ptr<kvm_t, closer> kd{kvm_open(nullptr, nullptr, nullptr, O_RDONLY, nullptr)};
++
+ if (!kd)
+ {
+ BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
+ return vec;
+ }
+- while ((proc_info = kvm_nextproc(kd)))
++ while ((proc_info = kvm_nextproc(kd.get())))
+ {
+- if (kvm_kread(kd, (std::uintptr_t)proc_info->p_pidp, &cur_pid, sizeof(cur_pid)) != -1)
++ if (kvm_kread(kd.get(), (std::uintptr_t)proc_info->p_pidp, &cur_pid, sizeof(cur_pid)) != -1)
+ {
+ vec.insert(vec.begin(), cur_pid.pid_id);
+ }
+@@ -680,7 +681,7 @@ pid_type parent_pid(pid_type pid, boost:
+ BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
+ return ppid;
+ }
+- if ((proc_info = kvm_getproc(kd, pid)))
++ if ((proc_info = kvm_getproc(kd.get(), pid)))
+ {
+ ppid = proc_info->p_ppid;
+ }
+@@ -702,17 +703,17 @@ std::vector<pid_type> child_pids(pid_typ
+ }
+ };
+
+- std::unique_ptr<kvm_t, closer> kd{kvm_open(nullptr, nullptr, nullptr, O_RDONLY, nullptr);
++ std::unique_ptr<kvm_t, closer> kd{kvm_open(nullptr, nullptr, nullptr, O_RDONLY, nullptr)};
+ if (!kd)
+ {
+ BOOST_PROCESS_V2_ASSIGN_LAST_ERROR(ec)
+ return vec;
+ }
+- while ((proc_info = kvm_nextproc(kd)))
++ while ((proc_info = kvm_nextproc(kd.get())))
+ {
+ if (proc_info->p_ppid == pid)
+ {
+- if (kvm_kread(kd, (std::uintptr_t)proc_info->p_pidp, &cur_pid, sizeof(cur_pid)) != -1)
++ if (kvm_kread(kd.get(), (std::uintptr_t)proc_info->p_pidp, &cur_pid, sizeof(cur_pid)) != -1)
+ {
+ vec.insert(vec.begin(), cur_pid.pid_id);
+ }
Home |
Main Index |
Thread Index |
Old Index