commit:     3717ac89376dd29fbe0e5220b881a3e99339d331
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 16:37:44 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 20 16:37:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3717ac89

dev-libs/boost: fix USE=context on arm64

Closes: https://bugs.gentoo.org/904132
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../{boost-1.82.0.ebuild => boost-1.82.0-r1.ebuild}   |  1 +
 dev-libs/boost/files/boost-1.82.0-context-arm64.patch | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/dev-libs/boost/boost-1.82.0.ebuild 
b/dev-libs/boost/boost-1.82.0-r1.ebuild
similarity index 99%
rename from dev-libs/boost/boost-1.82.0.ebuild
rename to dev-libs/boost/boost-1.82.0-r1.ebuild
index 30ce182a1f86..f257063c371d 100644
--- a/dev-libs/boost/boost-1.82.0.ebuild
+++ b/dev-libs/boost/boost-1.82.0-r1.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-1.81.0-phoenix-multiple-definitions.patch
 
        # (upstreamed)
+       "${FILESDIR}"/${PN}-1.82.0-context-arm64.patch
 )
 
 python_bindings_needed() {

diff --git a/dev-libs/boost/files/boost-1.82.0-context-arm64.patch 
b/dev-libs/boost/files/boost-1.82.0-context-arm64.patch
new file mode 100644
index 000000000000..a4efac7f2f62
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.82.0-context-arm64.patch
@@ -0,0 +1,19 @@
+https://github.com/boostorg/context/commit/d039c8e4da79dbc76481236249e22892bfdde047
+https://bugs.gentoo.org/904132
+
+From d039c8e4da79dbc76481236249e22892bfdde047 Mon Sep 17 00:00:00 2001
+From: Nikita Kniazev <nok.ra...@gmail.com>
+Date: Thu, 23 Mar 2023 16:23:07 +0300
+Subject: [PATCH] Fix arm64 detection broken by recent B2 change
+
+--- a/libs/context/build/Jamfile.v2
++++ b/libs/context/build/Jamfile.v2
+@@ -79,7 +79,7 @@ local rule default_abi ( )
+     local tmp = sysv ;
+     if [ os.name ] = "NT" { tmp = ms ; }
+     else if [ os.name ] = "CYGWIN" { tmp = ms ; }
+-    else if [ os.platform ] = "ARM" { tmp = aapcs ; }
++    else if [ os.platform ] in ARM ARM64 { tmp = aapcs ; }
+     else if [ os.platform ] = "MIPS32" { tmp = o32 ; }
+     else if [ os.platform ] = "MIPS64" { tmp = n64 ; }
+     return $(tmp) ;

Reply via email to