commit: 1a9b0d1fe535f498e607f7f8f860656237af347e Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org> AuthorDate: Sun Jul 3 03:25:27 2022 +0000 Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org> CommitDate: Sun Jul 3 08:31:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a9b0d1f
dev-libs/boost: fix build for 1.79.0 Fix upstream issue causing configure errors on multiple arches. Changes are hand-picked into the dist sources tree. One file rename is reverted to make scrubbed patch work with patch(1). Bug: https://bugs.gentoo.org/843212 Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org> dev-libs/boost/boost-1.79.0.ebuild | 1 + .../files/boost-1.79.0-fix-mips1-transition.patch | 39 ++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/dev-libs/boost/boost-1.79.0.ebuild b/dev-libs/boost/boost-1.79.0.ebuild index 13fa77c98924..71cb13108ea5 100644 --- a/dev-libs/boost/boost-1.79.0.ebuild +++ b/dev-libs/boost/boost-1.79.0.ebuild @@ -53,6 +53,7 @@ PATCHES=( # Boost.MPI's __init__.py doesn't work on Py3 "${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch "${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch + "${FILESDIR}"/${PN}-1.79.0-fix-mips1-transition.patch ) python_bindings_needed() { 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 ;
