diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
commit | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch) | |
tree | c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /dev-libs/boost/files | |
parent | e9d044d4b9b71200a96adfa280848858c0f468c9 (diff) |
gentoo resync : 05.12.2021
Diffstat (limited to 'dev-libs/boost/files')
-rw-r--r-- | dev-libs/boost/files/boost-1.77.0-fix-process-include.patch | 19 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.77.0-python-3.10.patch | 44 |
2 files changed, 63 insertions, 0 deletions
diff --git a/dev-libs/boost/files/boost-1.77.0-fix-process-include.patch b/dev-libs/boost/files/boost-1.77.0-fix-process-include.patch new file mode 100644 index 000000000000..566603b360ac --- /dev/null +++ b/dev-libs/boost/files/boost-1.77.0-fix-process-include.patch @@ -0,0 +1,19 @@ +https://github.com/boostorg/process/commit/e08374ed95ac33865bda40602c94909e7cd9607f.patch +https://bugs.gentoo.org/827899 + +From: Eddie-cz <48474051+Eddie-cz@users.noreply.github.com> +Date: Mon, 2 Aug 2021 10:49:42 +0200 +Subject: [PATCH] Update wchar_t.hpp + +--- a/boost/process/detail/traits/wchar_t.hpp ++++ b/boost/process/detail/traits/wchar_t.hpp +@@ -12,6 +12,8 @@ + #include <boost/process/detail/traits/env.hpp> + #include <boost/process/locale.hpp> + ++#include <algorithm> ++ + namespace boost { namespace process { namespace detail { + + //template + diff --git a/dev-libs/boost/files/boost-1.77.0-python-3.10.patch b/dev-libs/boost/files/boost-1.77.0-python-3.10.patch new file mode 100644 index 000000000000..69181b1fa42b --- /dev/null +++ b/dev-libs/boost/files/boost-1.77.0-python-3.10.patch @@ -0,0 +1,44 @@ +https://github.com/boostorg/boost_install/commit/0605dadfacf51994dcd8c5c82fb733dc6fa24073 + +From: Martin Jansa <martin.jansa@lge.com> +Date: Tue, 19 Oct 2021 12:24:31 +0000 +Subject: [PATCH] BoostConfig.cmake: allow searching for python310 + +* accept double digits in Python3_VERSION_MINOR + +* if someone is using e.g.: + find_package(Python3 REQUIRED) + find_package(Boost REQUIRED python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}) + + with python-3.10 then it currently fails with: + + -- Found PythonLibs: /usr/lib/libpython3.10.so (found version "3.10.0") + -- Found Python3: -native/usr/bin/python3-native/python3 (found version "3.10.0") found components: Interpreter + CMake Error at /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:141 (find_package): + Could not find a package configuration file provided by "boost_python310" + (requested version 1.77.0) with any of the following names: + + boost_python310Config.cmake + boost_python310-config.cmake + + Add the installation prefix of "boost_python310" to CMAKE_PREFIX_PATH or + set "boost_python310_DIR" to a directory containing one of the above files. + If "boost_python310" provides a separate development package or SDK, be + sure it has been installed. + Call Stack (most recent call first): + /usr/lib/cmake/Boost-1.77.0/BoostConfig.cmake:258 (boost_find_component) + /usr/share/cmake-3.21/Modules/FindBoost.cmake:594 (find_package) + CMakeLists.txt:18 (find_package) + +Signed-off-by: Martin Jansa <martin.jansa@lge.com> +--- a/tools/boost_install/BoostConfig.cmake ++++ b/tools/boost_install/BoostConfig.cmake +@@ -113,7 +113,7 @@ macro(boost_find_component comp required quiet) + set(_BOOST_REQUIRED REQUIRED) + endif() + +- if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9])$") ++ if("${comp}" MATCHES "^(python|numpy|mpi_python)([1-9])([0-9][0-9]?)$") + + # handle pythonXY and numpyXY versioned components for compatibility + |