From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1694B158042 for ; Mon, 4 Nov 2024 23:42:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 344A3E07BA; Mon, 4 Nov 2024 23:42:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1D3DCE07BA for ; Mon, 4 Nov 2024 23:42:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 459BF342FEB for ; Mon, 4 Nov 2024 23:42:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A97431953 for ; Mon, 4 Nov 2024 23:42:00 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1730763570.b67739f35ad1f35569215b985db2161a301be400.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/cpuid/, sys-apps/cpuid/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/cpuid/cpuid-20241023.ebuild sys-apps/cpuid/files/cpuid-20241023-makefile.patch X-VCS-Directories: sys-apps/cpuid/files/ sys-apps/cpuid/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: b67739f35ad1f35569215b985db2161a301be400 X-VCS-Branch: master Date: Mon, 4 Nov 2024 23:42:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1e00d858-a3f6-46df-b216-3e0e25e65289 X-Archives-Hash: f9ea591fb76ce97aa1abeade5e35220c commit: b67739f35ad1f35569215b985db2161a301be400 Author: Conrad Kostecki gentoo org> AuthorDate: Mon Nov 4 23:39:30 2024 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Mon Nov 4 23:39:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b67739f3 sys-apps/cpuid: fix patch Closes: https://bugs.gentoo.org/942764 Signed-off-by: Conrad Kostecki gentoo.org> sys-apps/cpuid/cpuid-20241023.ebuild | 2 +- sys-apps/cpuid/files/cpuid-20241023-makefile.patch | 38 ++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/sys-apps/cpuid/cpuid-20241023.ebuild b/sys-apps/cpuid/cpuid-20241023.ebuild index c2868c0d5525..f9116f2c451e 100644 --- a/sys-apps/cpuid/cpuid-20241023.ebuild +++ b/sys-apps/cpuid/cpuid-20241023.ebuild @@ -20,7 +20,7 @@ BDEPEND=" DOCS=( "ChangeLog" "FUTURE" ) -PATCHES=( "${FILESDIR}/${PN}-20220620-makefile.patch" ) +PATCHES=( "${FILESDIR}/${PN}-20241023-makefile.patch" ) src_prepare() { default diff --git a/sys-apps/cpuid/files/cpuid-20241023-makefile.patch b/sys-apps/cpuid/files/cpuid-20241023-makefile.patch new file mode 100644 index 000000000000..fa4d4c02e2a9 --- /dev/null +++ b/sys-apps/cpuid/files/cpuid-20241023-makefile.patch @@ -0,0 +1,38 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,4 +1,4 @@ +-CFLAGS+=-g ++CFLAGS+= + CPPFLAGS?= + LDFLAGS?= + ifneq (,$(findstring arch=i386,$(CFLAGS))) +@@ -6,7 +6,7 @@ + endif + CFL=$(CPPFLAGS) $(CFLAGS) $(CISA) -Wall -W -Wshadow -Wcast-align -Wredundant-decls -Wbad-function-cast -Wcast-qual -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wimplicit-fallthrough -Wunused-parameter -Wundef -D_FILE_OFFSET_BITS=64 -DVERSION=$(VERSION) + CFL_OPT=-O3 $(CFL) -Wformat-overflow=2 +-INSTALL_STRIP=-s ++INSTALL_STRIP= + + PACKAGE=cpuid + VERSION=20241023 +@@ -41,7 +41,7 @@ + + BUILDROOT=$(DESTDIR) + +-default: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz ++default: $(PROG) cpuinfo2cpuid + + $(PROG): cpuid.c Makefile + $(CC) $(CFL) $(LDFLAGS) -o $@ cpuid.c +@@ -62,9 +62,9 @@ + + install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz + install -D $(INSTALL_STRIP) -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG) +- install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz ++ install -D -m 444 $(PROG).man $(BUILDROOT)/usr/share/man/man1/$(PROG).1 + install -D -m 755 cpuinfo2cpuid $(BUILDROOT)/usr/bin/cpuinfo2cpuid +- install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz ++ install -D -m 444 cpuinfo2cpuid.man $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1 + + clean: + rm -f $(PROG) $(PROG).i386 $(PROG).x86_64