diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
commit | 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch) | |
tree | 8c816148bcbd22757d892089c989ae614eae4f5a /dev-libs/boost/files | |
parent | 0f558761aa2dee1017b4751e4017205e015a9560 (diff) |
gentoo resync : 09.07.2022
Diffstat (limited to 'dev-libs/boost/files')
-rw-r--r-- | dev-libs/boost/files/boost-1.78.0-interprocess-musl-include.patch | 25 | ||||
-rw-r--r-- | dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch | 39 |
2 files changed, 39 insertions, 25 deletions
diff --git a/dev-libs/boost/files/boost-1.78.0-interprocess-musl-include.patch b/dev-libs/boost/files/boost-1.78.0-interprocess-musl-include.patch deleted file mode 100644 index 85d25861f11b..000000000000 --- a/dev-libs/boost/files/boost-1.78.0-interprocess-musl-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/boostorg/interprocess/commit/d002a0d929ecb031843d806c2bda69e013442e13 -https://bugs.gentoo.org/829147 - -From: Leonardo Neumann <leonardo@neumann.dev.br> -Date: Mon, 13 Dec 2021 01:07:20 -0300 -Subject: [PATCH] Fix missing sys/stat.h include on musl-based systems - -Boost 1.78.0 fails to build on musl-based systems because musl does -not include sys/stat.h by default. - -Fixes #161 ("Boost compiler error") ---- a/boost/interprocess/permissions.hpp -+++ b/boost/interprocess/permissions.hpp -@@ -29,6 +29,10 @@ - - #include <boost/interprocess/detail/win32_api.hpp> - -+#else -+ -+#include <sys/stat.h> -+ - #endif - - #endif //#ifndef BOOST_INTERPROCESS_DOXYGEN_INVOKED - diff --git a/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch b/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch new file mode 100644 index 000000000000..81b29ac6cac1 --- /dev/null +++ b/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch @@ -0,0 +1,39 @@ +https://github.com/boostorg/boost/commit/791442bf1ed7a3b14893ed9e73ef2ab32b2a6026, and +https://github.com/boostorg/config/commit/1a55d1d9c6d1cf7739645080bdd92fe903b4211e without the file renaming. + +--- a/boostcpp.jam ++++ b/boostcpp.jam +@@ -634,7 +634,7 @@ rule address-model ( ) + return <conditional>@boostcpp.deduce-address-model ; + } + +-local deducable-architectures = arm mips1 power riscv s390x sparc x86 combined ; ++local deducable-architectures = arm mips power riscv s390x sparc x86 combined ; + feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ; + for a in $(deducable-architectures) + { +@@ -645,10 +645,10 @@ rule deduce-architecture ( properties * ) + { + local result ; + local filtered = [ toolset-properties $(properties) ] ; +- local names = arm mips1 power riscv s390x sparc x86 combined ; ++ local names = arm mips power riscv s390x sparc x86 combined ; + local idx = [ configure.find-builds "default architecture" : $(filtered) + : /boost/architecture//arm +- : /boost/architecture//mips1 ++ : /boost/architecture//mips + : /boost/architecture//power + : /boost/architecture//riscv + : /boost/architecture//s390x +--- a/libs/config/checks/architecture/Jamfile.jam ++++ b/libs/config/checks/architecture/Jamfile.jam +@@ -18,7 +18,8 @@ obj 64 : 64.cpp ; + + obj arm : arm.cpp ; + obj combined : combined.cpp ; +-obj mips1 : mips1.cpp ; ++obj mips : mips1.cpp ; ++alias mips1 : mips ; # Backwards compatibility + obj power : power.cpp ; + obj riscv : riscv.cpp ; + obj sparc : sparc.cpp ; |