diff options
Diffstat (limited to 'devel/boost-libs/files')
5 files changed, 76 insertions, 47 deletions
diff --git a/devel/boost-libs/files/patch-1.87-smart_ptr b/devel/boost-libs/files/patch-1.87-smart_ptr deleted file mode 100644 index 4c5bd10947e8..000000000000 --- a/devel/boost-libs/files/patch-1.87-smart_ptr +++ /dev/null @@ -1,36 +0,0 @@ -From e7433ba54596da97cb7859455cd37ca140305a9c Mon Sep 17 00:00:00 2001 -From: Peter Dimov <pdimov@gmail.com> -Date: Mon, 13 Jan 2025 16:13:04 +0200 -Subject: [PATCH] Fix operator<< for shared_ptr and intrusive_ptr. Fixes #115. - ---- - boost/smart_ptr/intrusive_ptr.hpp | 2 +- - boost/smart_ptr/shared_ptr.hpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git boost/smart_ptr/intrusive_ptr.hpp boost/smart_ptr/intrusive_ptr.hpp -index ddb20c0b0e..11b476513a 100644 ---- boost/smart_ptr/intrusive_ptr.hpp -+++ boost/smart_ptr/intrusive_ptr.hpp -@@ -285,7 +285,7 @@ template<class T, class U> intrusive_ptr<T> dynamic_pointer_cast( intrusive_ptr< - - // operator<< - --template<class Y> std::ostream & operator<< (std::ostream & os, intrusive_ptr<Y> const & p) -+template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, intrusive_ptr<Y> const & p) - { - os << p.get(); - return os; -diff --git boost/smart_ptr/shared_ptr.hpp boost/smart_ptr/shared_ptr.hpp -index 2431a33590..2deed9b632 100644 ---- boost/smart_ptr/shared_ptr.hpp -+++ boost/smart_ptr/shared_ptr.hpp -@@ -775,7 +775,7 @@ template<class T> inline typename shared_ptr<T>::element_type * get_pointer(shar - - // operator<< - --template<class Y> std::ostream & operator<< (std::ostream & os, shared_ptr<Y> const & p) -+template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::basic_ostream<E, T> & os, shared_ptr<Y> const & p) - { - os << p.get(); - return os; diff --git a/devel/boost-libs/files/patch-AT_NO_AUTOMOUNT b/devel/boost-libs/files/patch-AT_NO_AUTOMOUNT new file mode 100644 index 000000000000..9db1dbe7d9ef --- /dev/null +++ b/devel/boost-libs/files/patch-AT_NO_AUTOMOUNT @@ -0,0 +1,36 @@ +The AT_NO_AUTOMOUNT seems to be a Linux-only thing... + + -mi + +--- libs/filesystem/config/has_posix_at_apis.cpp 2025-05-29 12:45:36.456840000 -0400 ++++ libs/filesystem/config/has_posix_at_apis.cpp 2025-05-29 18:17:30.866425000 -0400 +@@ -23,5 +23,5 @@ + + struct stat st; +- res |= fstatat(fd1, "y", &st, AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW); ++ res |= fstatat(fd1, "y", &st, AT_SYMLINK_NOFOLLOW); + + res |= linkat(fd1, "y", fd1, "z", 0); +--- libs/filesystem/src/operations.cpp 2025-05-29 18:20:19.260975000 -0400 ++++ libs/filesystem/src/operations.cpp 2025-05-29 20:12:31.002264000 -0400 +@@ -355,5 +355,5 @@ + { + struct ::stat st; +- flags &= AT_EMPTY_PATH | AT_NO_AUTOMOUNT | AT_SYMLINK_NOFOLLOW; ++ flags &= AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW; + int res = ::fstatat(dirfd, path, &st, flags); + if (BOOST_LIKELY(res == 0)) +@@ -508,5 +508,5 @@ + #elif defined(BOOST_FILESYSTEM_HAS_POSIX_AT_APIS) + struct ::stat path_stat; +- int err = ::fstatat(basedir_fd, p.c_str(), &path_stat, AT_NO_AUTOMOUNT); ++ int err = ::fstatat(basedir_fd, p.c_str(), &path_stat, 0); + #else + struct ::stat path_stat; +@@ -569,5 +569,5 @@ + #elif defined(BOOST_FILESYSTEM_HAS_POSIX_AT_APIS) + struct ::stat path_stat; +- int err = ::fstatat(basedir_fd, p.c_str(), &path_stat, AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT); ++ int err = ::fstatat(basedir_fd, p.c_str(), &path_stat, AT_SYMLINK_NOFOLLOW); + #else + struct ::stat path_stat; diff --git a/devel/boost-libs/files/patch-boost_dll_detail_posix_program__location__impl.hpp b/devel/boost-libs/files/patch-boost_dll_detail_posix_program__location__impl.hpp new file mode 100644 index 000000000000..85d01b6cf416 --- /dev/null +++ b/devel/boost-libs/files/patch-boost_dll_detail_posix_program__location__impl.hpp @@ -0,0 +1,30 @@ +From d662bcbb67ae5da919d35f83e0bcc21769de0ac4 Mon Sep 17 00:00:00 2001 +From: Antony Polukhin <antoshkka@gmail.com> +Date: Wed, 11 Jun 2025 09:59:25 +0300 +Subject: [PATCH] Fix usage of missing variable (#98) + +Fixes https://github.com/boostorg/dll/issues/96 +--- boost/dll/detail/posix/program_location_impl.hpp.orig 2025-04-03 11:37:24 UTC ++++ boost/dll/detail/posix/program_location_impl.hpp +@@ -70,9 +70,10 @@ namespace boost { namespace dll { namespace detail { + mib[2] = KERN_PROC_PATHNAME; + mib[3] = -1; + char path[1024]; +- size_t size = sizeof(buf); +- if (sysctl(mib, 4, path, &size, nullptr, 0) == 0) ++ size_t size = sizeof(path); ++ if (sysctl(mib, 4, path, &size, nullptr, 0) == 0) { + return boost::dll::fs::path(path); ++ } + + const auto errno_snapshot = static_cast<std::errc>(errno); + if (errno_snapshot != std::errc::not_enough_memory) { +@@ -83,7 +84,7 @@ namespace boost { namespace dll { namespace detail { + + std::string p; + p.resize(size); +- if (sysctl(mib, 4, p.data(), &size, nullptr, 0) != 0) { ++ if (sysctl(mib, 4, &p[0], &size, nullptr, 0) != 0) { + ec = std::make_error_code( + static_cast<std::errc>(errno) + ); diff --git a/devel/boost-libs/files/patch-boost_range_detail_any__iterator__interface.hpp b/devel/boost-libs/files/patch-boost_range_detail_any__iterator__interface.hpp new file mode 100644 index 000000000000..22e2395f0031 --- /dev/null +++ b/devel/boost-libs/files/patch-boost_range_detail_any__iterator__interface.hpp @@ -0,0 +1,10 @@ +--- boost/range/detail/any_iterator_interface.hpp.orig 2025-04-03 11:37:29 UTC ++++ boost/range/detail/any_iterator_interface.hpp +@@ -13,6 +13,7 @@ + #include <boost/mpl/if.hpp> + #include <boost/range/detail/any_iterator_buffer.hpp> + #include <boost/iterator/iterator_categories.hpp> ++#include <boost/type_traits/add_const.hpp> + #include <boost/type_traits/is_convertible.hpp> + #include <boost/type_traits/is_reference.hpp> + #include <boost/type_traits/remove_const.hpp> diff --git a/devel/boost-libs/files/patch-libs_process_src_ext_exe.cpp b/devel/boost-libs/files/patch-libs_process_src_ext_exe.cpp deleted file mode 100644 index e6dc602952da..000000000000 --- a/devel/boost-libs/files/patch-libs_process_src_ext_exe.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/process/src/ext/exe.cpp.orig 2024-12-05 00:53:35 UTC -+++ libs/process/src/ext/exe.cpp -@@ -138,7 +138,7 @@ filesystem::path exe(boost::process::v2::pid_type pid, - 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 |