[gentoo-commits] repo/gentoo:master commit in: dev-libs/boost/files/, dev-libs/boost/

[David Seifert]

commit:     4917db41e78e43f9288405745bedd9a6cf679833
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 16:32:40 2024 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 16:32:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4917db41

dev-libs/boost: update patch with upstreamed info

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-libs/boost/boost-1.84.0-r1.ebuild               |  2 +-
 dev-libs/boost/files/boost-1.79.0-context-x32.patch | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dev-libs/boost/boost-1.84.0-r1.ebuild 
b/dev-libs/boost/boost-1.84.0-r1.ebuild
index 4b95253ac198..a9eadf2838c9 100644
--- a/dev-libs/boost/boost-1.84.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.84.0-r1.ebuild
@@ -49,7 +49,6 @@ BDEPEND=">=dev-build/b2-4.9.2"
 
 PATCHES=(
        "${FILESDIR}"/${PN}-1.81.0-disable_icu_rpath.patch
-       "${FILESDIR}"/${PN}-1.79.0-context-x32.patch
        "${FILESDIR}"/${PN}-1.79.0-build-auto_index-tool.patch
        # Boost.MPI's __init__.py doesn't work on Py3
        "${FILESDIR}"/${PN}-1.79.0-boost-mpi-python-PEP-328.patch
@@ -57,6 +56,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-1.83.0-math-gcc14.patch
 
        # upstreamed
+       "${FILESDIR}"/${PN}-1.79.0-context-x32.patch
        "${FILESDIR}"/${PN}-1.84.0-signals2-patch1.patch
        "${FILESDIR}"/${PN}-1.84.0-signals2-patch2.patch
 )

diff --git a/dev-libs/boost/files/boost-1.79.0-context-x32.patch 
b/dev-libs/boost/files/boost-1.79.0-context-x32.patch
index 9ee3d545d618..625599152328 100644
--- a/dev-libs/boost/files/boost-1.79.0-context-x32.patch
+++ b/dev-libs/boost/files/boost-1.79.0-context-x32.patch
@@ -1,3 +1,10 @@
+https://github.com/boostorg/context/pull/247
+
+From 922e033fa1464e506c82a0d6980103268f7197cf Mon Sep 17 00:00:00 2001
+From: David Seifert <s...@gentoo.org>
+Date: Tue, 23 Jan 2024 13:23:29 +0100
+Subject: [PATCH] Fix x32 build on x86-64
+
 --- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S
 +++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S
 @@ -24,6 +24,10 @@
@@ -11,7 +18,7 @@
  .file "jump_i386_sysv_elf_gas.S"
  .text
  .globl jump_fcontext
-@@ -81,3 +85,5 @@
+@@ -91,3 +95,5 @@ jump_fcontext:
  
  /* Mark that we don't need executable stack.  */
  .section .note.GNU-stack,"",%progbits
@@ -30,7 +37,7 @@
  .file "make_i386_sysv_elf_gas.S"
  .text
  .globl make_fcontext
-@@ -105,3 +109,5 @@
+@@ -111,3 +115,5 @@ finish:
  
  /* Mark that we don't need executable stack.  */
  .section .note.GNU-stack,"",%progbits