| 1 |
commit: 1a9b0d1fe535f498e607f7f8f860656237af347e |
| 2 |
Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 3 03:25:27 2022 +0000 |
| 4 |
Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 3 08:31:31 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a9b0d1f |
| 7 |
|
| 8 |
dev-libs/boost: fix build for 1.79.0 |
| 9 |
|
| 10 |
Fix upstream issue causing configure errors on multiple arches. Changes |
| 11 |
are hand-picked into the dist sources tree. One file rename is reverted |
| 12 |
to make scrubbed patch work with patch(1). |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/843212 |
| 15 |
Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-libs/boost/boost-1.79.0.ebuild | 1 + |
| 18 |
.../files/boost-1.79.0-fix-mips1-transition.patch | 39 ++++++++++++++++++++++ |
| 19 |
2 files changed, 40 insertions(+) |
| 20 |
|
| 21 |
diff --git a/dev-libs/boost/boost-1.79.0.ebuild b/dev-libs/boost/boost-1.79.0.ebuild |
| 22 |
index 13fa77c98924..71cb13108ea5 100644 |
| 23 |
--- a/dev-libs/boost/boost-1.79.0.ebuild |
| 24 |
+++ b/dev-libs/boost/boost-1.79.0.ebuild |
| 25 |
@@ -53,6 +53,7 @@ PATCHES=( |
| 26 |
# Boost.MPI's __init__.py doesn't work on Py3 |
| 27 |
"${FILESDIR}"/${PN}-1.73-boost-mpi-python-PEP-328.patch |
| 28 |
"${FILESDIR}"/${PN}-1.74-CVE-2012-2677.patch |
| 29 |
+ "${FILESDIR}"/${PN}-1.79.0-fix-mips1-transition.patch |
| 30 |
) |
| 31 |
|
| 32 |
python_bindings_needed() { |
| 33 |
|
| 34 |
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 |
| 35 |
new file mode 100644 |
| 36 |
index 000000000000..81b29ac6cac1 |
| 37 |
--- /dev/null |
| 38 |
+++ b/dev-libs/boost/files/boost-1.79.0-fix-mips1-transition.patch |
| 39 |
@@ -0,0 +1,39 @@ |
| 40 |
+https://github.com/boostorg/boost/commit/791442bf1ed7a3b14893ed9e73ef2ab32b2a6026, and |
| 41 |
+https://github.com/boostorg/config/commit/1a55d1d9c6d1cf7739645080bdd92fe903b4211e without the file renaming. |
| 42 |
+ |
| 43 |
+--- a/boostcpp.jam |
| 44 |
++++ b/boostcpp.jam |
| 45 |
+@@ -634,7 +634,7 @@ rule address-model ( ) |
| 46 |
+ return <conditional>@boostcpp.deduce-address-model ; |
| 47 |
+ } |
| 48 |
+ |
| 49 |
+-local deducable-architectures = arm mips1 power riscv s390x sparc x86 combined ; |
| 50 |
++local deducable-architectures = arm mips power riscv s390x sparc x86 combined ; |
| 51 |
+ feature.feature deduced-architecture : $(deducable-architectures) : propagated optional composite hidden ; |
| 52 |
+ for a in $(deducable-architectures) |
| 53 |
+ { |
| 54 |
+@@ -645,10 +645,10 @@ rule deduce-architecture ( properties * ) |
| 55 |
+ { |
| 56 |
+ local result ; |
| 57 |
+ local filtered = [ toolset-properties $(properties) ] ; |
| 58 |
+- local names = arm mips1 power riscv s390x sparc x86 combined ; |
| 59 |
++ local names = arm mips power riscv s390x sparc x86 combined ; |
| 60 |
+ local idx = [ configure.find-builds "default architecture" : $(filtered) |
| 61 |
+ : /boost/architecture//arm |
| 62 |
+- : /boost/architecture//mips1 |
| 63 |
++ : /boost/architecture//mips |
| 64 |
+ : /boost/architecture//power |
| 65 |
+ : /boost/architecture//riscv |
| 66 |
+ : /boost/architecture//s390x |
| 67 |
+--- a/libs/config/checks/architecture/Jamfile.jam |
| 68 |
++++ b/libs/config/checks/architecture/Jamfile.jam |
| 69 |
+@@ -18,7 +18,8 @@ obj 64 : 64.cpp ; |
| 70 |
+ |
| 71 |
+ obj arm : arm.cpp ; |
| 72 |
+ obj combined : combined.cpp ; |
| 73 |
+-obj mips1 : mips1.cpp ; |
| 74 |
++obj mips : mips1.cpp ; |
| 75 |
++alias mips1 : mips ; # Backwards compatibility |
| 76 |
+ obj power : power.cpp ; |
| 77 |
+ obj riscv : riscv.cpp ; |
| 78 |
+ obj sparc : sparc.cpp ; |
Archives