[gentoo-commits] repo/gentoo:master commit in: sys-libs/libucontext/, sys-libs/libucontext/files/

[Sam James]

commit:     1d8718303b00e24d21ce70a6891a096e89c96f1d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  7 03:56:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb  7 04:00:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d871830

sys-libs/libucontext: respect CFLAGS without overriding upstream define

Fixes musl runtime as the right symbols get defined now (unprefixed).

Bug: https://github.com/rui314/mold/issues/281
Bug: https://bugs.gentoo.org/832700
Closes: https://bugs.gentoo.org/832677
Thanks-to: Andrew Athalye <andrewathalye <AT> outlook.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../libucontext/files/libucontext-1.1-respect-CFLAGS.patch  | 13 +++++++++++++
 .../{libucontext-1.1.ebuild => libucontext-1.1-r1.ebuild}   | 10 +++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/sys-libs/libucontext/files/libucontext-1.1-respect-CFLAGS.patch b/sys-libs/libucontext/files/libucontext-1.1-respect-CFLAGS.patch
new file mode 100644
index 000000000000..49dd872690d5
--- /dev/null
+++ b/sys-libs/libucontext/files/libucontext-1.1-respect-CFLAGS.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/832677
+https://github.com/kaniini/libucontext/issues/39
+--- a/Makefile
++++ b/Makefile
+@@ -17,7 +17,7 @@ endif
+ LIBDIR := /lib
+ INCLUDEDIR := /usr/include
+ PKGCONFIGDIR := /usr/lib/pkgconfig
+-CFLAGS := -ggdb3 -O2 -Wall
++CFLAGS ?= -ggdb3 -O2 -Wall
+ CPPFLAGS := -Iinclude -Iarch/${ARCH} -Iarch/common
+ EXPORT_UNPREFIXED := yes
+ FREESTANDING := no

diff --git a/sys-libs/libucontext/libucontext-1.1.ebuild b/sys-libs/libucontext/libucontext-1.1-r1.ebuild
similarity index 82%
rename from sys-libs/libucontext/libucontext-1.1.ebuild
rename to sys-libs/libucontext/libucontext-1.1-r1.ebuild
index f637a693a337..cf76cfa1a756 100644
--- a/sys-libs/libucontext/libucontext-1.1.ebuild
+++ b/sys-libs/libucontext/libucontext-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,6 +20,10 @@ BDEPEND="man? ( app-text/scdoc )"
 # segfault needs investigation
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-respect-CFLAGS.patch
+)
+
 src_compile() {
 	tc-export AR CC
 
@@ -39,11 +43,11 @@ src_compile() {
 		arch="$(uname -m)"
 	fi
 
-	emake ARCH="${arch}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" all $(usev man 'docs')
+	emake ARCH="${arch}" LDFLAGS="${LDFLAGS}" all $(usev man 'docs')
 }
 
 src_test() {
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" check
+	emake LDFLAGS="${LDFLAGS}" check
 }
 
 src_install() {