[gentoo-commits] proj/genkernel:master commit in: patches/boost/1.79.0/

[gentoo-commits] proj/genkernel:master commit in: patches/boost/1.79.0/

[Sam James]

commit:     4714e523205dbf9288d7e236b00e61004c7b775f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 13:50:04 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 13:50:23 2023 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=4714e523

patches: boost: fix build on some alt-arches

Bug: https://bugs.gentoo.org/843212
Bug: https://bugs.gentoo.org/913150
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../1.79.0/boost-1.79.0-fix-mips1-transition.patch | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/patches/boost/1.79.0/boost-1.79.0-fix-mips1-transition.patch b/patches/boost/1.79.0/boost-1.79.0-fix-mips1-transition.patch
new file mode 100644
index 0000000..efcd385
--- /dev/null
+++ b/patches/boost/1.79.0/boost-1.79.0-fix-mips1-transition.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/843212
+https://bugs.gentoo.org/913150
+https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a9b0d1fe535f498e607f7f8f860656237af347e
+
+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 ;