diff options
| author |   Sam James <sam@gentoo.org> | 2022-02-07 03:56:24 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-02-07 04:00:57 +0000 |
| commit | 1d8718303b00e24d21ce70a6891a096e89c96f1d (patch) | |
| tree | 012047d7737b3c3cd68b2b99375e0c89d2acc2dc | |
| parent | dev-libs/libgamin: fix musl build (diff) | |
| download | gentoo-1d8718303b00e24d21ce70a6891a096e89c96f1d.tar.gz gentoo-1d8718303b00e24d21ce70a6891a096e89c96f1d.tar.bz2 gentoo-1d8718303b00e24d21ce70a6891a096e89c96f1d.zip | |
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@outlook.com>
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | sys-libs/libucontext/files/libucontext-1.1-respect-CFLAGS.patch | 13 | ||||
| -rw-r--r-- | sys-libs/libucontext/libucontext-1.1-r1.ebuild (renamed from sys-libs/libucontext/libucontext-1.1.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 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() { |