commit: 066876c1f6765853eef8747b7d1b094b87ce5ea3 Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> AuthorDate: Sun Sep 7 18:47:41 2025 +0000 Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org> CommitDate: Sun Sep 7 19:05:44 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=066876c1
sys-process/dumb-init: fix custom flags, EAPI=8 Closes: https://bugs.gentoo.org/726006 Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org> ...umb-init-1.2.5.ebuild => dumb-init-1.2.5-r1.ebuild} | 12 ++++++++---- .../dumb-init/files/dumb-init-1.2.5-flags.patch | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/sys-process/dumb-init/dumb-init-1.2.5.ebuild b/sys-process/dumb-init/dumb-init-1.2.5-r1.ebuild similarity index 78% rename from sys-process/dumb-init/dumb-init-1.2.5.ebuild rename to sys-process/dumb-init/dumb-init-1.2.5-r1.ebuild index 57b130122434..e33048e2dc3c 100644 --- a/sys-process/dumb-init/dumb-init-1.2.5.ebuild +++ b/sys-process/dumb-init/dumb-init-1.2.5-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit flag-o-matic toolchain-funcs @@ -15,14 +15,18 @@ KEYWORDS="~amd64 ~x86" IUSE="static" RESTRICT="test" +PATCHES=( + "${FILESDIR}"/${PN}-1.2.5-flags.patch +) + src_prepare() { default use static && append-cflags -static - sed -e "s|^CFLAGS=.*|CFLAGS=-std=gnu99 ${CFLAGS}|" -i Makefile || die } src_compile() { - CC="$(tc-getCC)" emake + tc-export CC + emake } src_install() { diff --git a/sys-process/dumb-init/files/dumb-init-1.2.5-flags.patch b/sys-process/dumb-init/files/dumb-init-1.2.5-flags.patch new file mode 100644 index 000000000000..74b8272f65b3 --- /dev/null +++ b/sys-process/dumb-init/files/dumb-init-1.2.5-flags.patch @@ -0,0 +1,18 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + SHELL=bash +-CFLAGS=-std=gnu99 -static -s -Wall -Werror -O3 ++CFLAGS+=-std=gnu99 + + TEST_PACKAGE_DEPS := build-essential python python-pip procps python-dev python-setuptools + +@@ -8,7 +8,7 @@ VERSION = $(shell cat VERSION) + + .PHONY: build + build: VERSION.h +- $(CC) $(CFLAGS) -o dumb-init dumb-init.c ++ $(CC) $(CFLAGS) $(LDFLAGS) -o dumb-init dumb-init.c + + VERSION.h: VERSION + echo '// THIS FILE IS AUTOMATICALLY GENERATED' > VERSION.h
