[gentoo-commits] repo/proj/guru:dev commit in: app-misc/cpufetch/, app-misc/cpufetch/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Takuya Wakazono" <pastalian46@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-misc/cpufetch/, app-misc/cpufetch/files/
Date: Thu,  8 Feb 2024 09:57:00 +0000 (UTC)	[thread overview]
Message-ID: <1707385727.b1eb6e8859008366e45279fee8530546d164bf57.pastalian46@gentoo> (raw)

commit:     b1eb6e8859008366e45279fee8530546d164bf57
Author:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Wed Feb  7 16:29:20 2024 +0000
Commit:     Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Thu Feb  8 09:48:47 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b1eb6e88

app-misc/cpufetch: respect CFLAGS and LDFLAGS

Closes: https://bugs.gentoo.org/924006
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>

 ...pufetch-1.05.ebuild => cpufetch-1.05-r1.ebuild} |  2 +-
 .../cpufetch/files/cpufetch-1.01-makefile.patch    | 57 -------------------
 .../cpufetch/files/cpufetch-1.02-makefile.patch    | 51 -----------------
 .../cpufetch/files/cpufetch-1.05-makefile.patch    | 66 ++++++++++++++++++++++
 .../files/cpufetch-1.05-respect-ldflags.patch      | 36 ------------
 5 files changed, 67 insertions(+), 145 deletions(-)

diff --git a/app-misc/cpufetch/cpufetch-1.05.ebuild b/app-misc/cpufetch/cpufetch-1.05-r1.ebuild
similarity index 91%
rename from app-misc/cpufetch/cpufetch-1.05.ebuild
rename to app-misc/cpufetch/cpufetch-1.05-r1.ebuild
index 25064201b9..c5a2b3b0a8 100644
--- a/app-misc/cpufetch/cpufetch-1.05.ebuild
+++ b/app-misc/cpufetch/cpufetch-1.05-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64"
 
-PATCHES=( "${FILESDIR}/${P}-respect-ldflags.patch" )
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
 
 src_prepare() {
 	default

diff --git a/app-misc/cpufetch/files/cpufetch-1.01-makefile.patch b/app-misc/cpufetch/files/cpufetch-1.01-makefile.patch
deleted file mode 100644
index 214920d8dd..0000000000
--- a/app-misc/cpufetch/files/cpufetch-1.01-makefile.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,3 @@
--CC ?= gcc
--
- CFLAGS+=-Wall -Wextra -pedantic
- SANITY_FLAGS=-Wfloat-equal -Wshadow -Wpointer-arith
- 
-@@ -23,17 +21,17 @@
- 			HEADERS += $(SRC_DIR)freq/freq.h
- 			CFLAGS += -pthread
-                 endif
--		CFLAGS += -DARCH_X86 -std=c99 -fstack-protector-all
-+		CFLAGS += -DARCH_X86 -std=c99
- 	else ifeq ($(arch), $(filter $(arch), ppc64le ppc64 ppcle ppc))
- 		SRC_DIR=src/ppc/
- 		SOURCE += $(COMMON_SRC) $(SRC_DIR)ppc.c $(SRC_DIR)uarch.c $(SRC_DIR)udev.c
- 		HEADERS += $(COMMON_HDR) $(SRC_DIR)ppc.h $(SRC_DIR)uarch.h  $(SRC_DIR)udev.c
--		CFLAGS += -DARCH_PPC -std=gnu99 -fstack-protector-all
-+		CFLAGS += -DARCH_PPC -std=gnu99
- 	else ifeq ($(arch), $(filter $(arch), arm aarch64_be aarch64 arm64 armv8b armv8l armv7l armv6l))
- 		SRC_DIR=src/arm/
- 		SOURCE += $(COMMON_SRC) $(SRC_DIR)midr.c $(SRC_DIR)uarch.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
- 		HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h  $(SRC_DIR)soc.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h
--		CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99 -fstack-protector-all
-+		CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99
- 
- 		os := $(shell uname -s)
- 		ifeq ($(os), Darwin)
-@@ -58,18 +56,8 @@
- 	OUTPUT=cpufetch.exe
- endif
- 
--all: CFLAGS += -O2
- all: $(OUTPUT)
- 
--debug: CFLAGS += -g -O0
--debug: $(OUTPUT)
--
--static: CFLAGS += -static -O2
--static: $(OUTPUT)
--
--strict: CFLAGS += -O2 -Werror -fsanitize=undefined -D_FORTIFY_SOURCE=2
--strict: $(OUTPUT)
--
- freq_nov.o: Makefile $(SRC_DIR)freq/freq_nov.c $(SRC_DIR)freq/freq_nov.h
- 	$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -pthread $(SRC_DIR)freq/freq_nov.c -o $@
- 
-@@ -80,7 +68,7 @@
- 	$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx512f -mfma -pthread $(SRC_DIR)freq/freq_avx512.c -o $@
- 
- $(OUTPUT): Makefile $(SOURCE) $(HEADERS)
--	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
- 
- run: $(OUTPUT)
- 	./$(OUTPUT)

diff --git a/app-misc/cpufetch/files/cpufetch-1.02-makefile.patch b/app-misc/cpufetch/files/cpufetch-1.02-makefile.patch
deleted file mode 100644
index 6bca12f1a6..0000000000
--- a/app-misc/cpufetch/files/cpufetch-1.02-makefile.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -23,17 +23,17 @@
- 			HEADERS += $(SRC_DIR)freq/freq.h
- 			CFLAGS += -pthread
-                 endif
--		CFLAGS += -DARCH_X86 -std=c99 -fstack-protector-all
-+		CFLAGS += -DARCH_X86 -std=c99
- 	else ifeq ($(arch), $(filter $(arch), ppc64le ppc64 ppcle ppc))
- 		SRC_DIR=src/ppc/
- 		SOURCE += $(COMMON_SRC) $(SRC_DIR)ppc.c $(SRC_DIR)uarch.c $(SRC_DIR)udev.c
- 		HEADERS += $(COMMON_HDR) $(SRC_DIR)ppc.h $(SRC_DIR)uarch.h  $(SRC_DIR)udev.c
--		CFLAGS += -DARCH_PPC -std=gnu99 -fstack-protector-all
-+		CFLAGS += -DARCH_PPC -std=gnu99
- 	else ifeq ($(arch), $(filter $(arch), arm aarch64_be aarch64 arm64 armv8b armv8l armv7l armv6l))
- 		SRC_DIR=src/arm/
- 		SOURCE += $(COMMON_SRC) $(SRC_DIR)midr.c $(SRC_DIR)uarch.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
- 		HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h  $(SRC_DIR)soc.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h
--		CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99 -fstack-protector-all
-+		CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99
- 
- 		os := $(shell uname -s)
- 		ifeq ($(os), Darwin)
-@@ -58,18 +58,8 @@
- 	OUTPUT=cpufetch.exe
- endif
- 
--all: CFLAGS += -O2
- all: $(OUTPUT)
- 
--debug: CFLAGS += -g -O0
--debug: $(OUTPUT)
--
--static: CFLAGS += -static -O2
--static: $(OUTPUT)
--
--strict: CFLAGS += -O2 -Werror -fsanitize=undefined -D_FORTIFY_SOURCE=2
--strict: $(OUTPUT)
--
- freq_nov.o: Makefile $(SRC_DIR)freq/freq_nov.c $(SRC_DIR)freq/freq_nov.h $(SRC_DIR)freq/freq.h
- 	$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -pthread $(SRC_DIR)freq/freq_nov.c -o $@
- 
-@@ -80,7 +70,7 @@
- 	$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx512f -pthread $(SRC_DIR)freq/freq_avx512.c -o $@
- 
- $(OUTPUT): Makefile $(SOURCE) $(HEADERS)
--	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
-+	$(CC) $(CFLAGS) -fPIE $(LDFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
- 
- run: $(OUTPUT)
- 	./$(OUTPUT)

diff --git a/app-misc/cpufetch/files/cpufetch-1.05-makefile.patch b/app-misc/cpufetch/files/cpufetch-1.05-makefile.patch
new file mode 100644
index 0000000000..e9969cd1bf
--- /dev/null
+++ b/app-misc/cpufetch/files/cpufetch-1.05-makefile.patch
@@ -0,0 +1,66 @@
+Respect CFLAGS and LDFLAGS.
+--- a/Makefile
++++ b/Makefile
+@@ -24,17 +24,17 @@ ifneq ($(OS),Windows_NT)
+ 			HEADERS += $(SRC_DIR)freq/freq.h
+ 			CFLAGS += -pthread
+                 endif
+-		CFLAGS += -DARCH_X86 -std=c99 -fstack-protector-all
++		CFLAGS += -DARCH_X86 -std=c99
+ 	else ifeq ($(arch), $(filter $(arch), ppc64le ppc64 ppcle ppc))
+ 		SRC_DIR=src/ppc/
+ 		SOURCE += $(COMMON_SRC) $(SRC_DIR)ppc.c $(SRC_DIR)uarch.c $(SRC_DIR)udev.c
+ 		HEADERS += $(COMMON_HDR) $(SRC_DIR)ppc.h $(SRC_DIR)uarch.h  $(SRC_DIR)udev.c
+-		CFLAGS += -DARCH_PPC -std=gnu99 -fstack-protector-all -Wno-language-extension-token
++		CFLAGS += -DARCH_PPC -std=gnu99 -Wno-language-extension-token
+ 	else ifeq ($(arch), $(filter $(arch), arm aarch64_be aarch64 arm64 armv8b armv8l armv7l armv6l))
+ 		SRC_DIR=src/arm/
+ 		SOURCE += $(COMMON_SRC) $(SRC_DIR)midr.c $(SRC_DIR)uarch.c $(SRC_COMMON)soc.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
+ 		HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h  $(SRC_COMMON)soc.h $(SRC_DIR)soc.h $(SRC_DIR)udev.c $(SRC_DIR)socs.h
+-		CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99 -fstack-protector-all
++		CFLAGS += -DARCH_ARM -Wno-unused-parameter -std=c99
+ 
+ 		os := $(shell uname -s)
+ 		ifeq ($(os), Darwin)
+@@ -45,7 +45,7 @@ ifneq ($(OS),Windows_NT)
+                 SRC_DIR=src/riscv/
+                 SOURCE += $(COMMON_SRC) $(SRC_DIR)riscv.c $(SRC_DIR)uarch.c $(SRC_COMMON)soc.c $(SRC_DIR)soc.c $(SRC_DIR)udev.c
+                 HEADERS += $(COMMON_HDR) $(SRC_DIR)riscv.h $(SRC_DIR)uarch.h $(SRC_COMMON)soc.h $(SRC_DIR)soc.h $(SRC_DIR)udev.h $(SRC_DIR)socs.h
+-                CFLAGS += -DARCH_RISCV -Wno-unused-parameter -std=c99 -fstack-protector-all
++                CFLAGS += -DARCH_RISCV -Wno-unused-parameter -std=c99
+ 	else
+ 		# Error lines should not be tabulated because Makefile complains about it
+ $(warning Unsupported arch detected: $(arch). See https://github.com/Dr-Noob/cpufetch#1-support)
+@@ -65,7 +65,6 @@ else
+ 	OUTPUT=cpufetch.exe
+ endif
+ 
+-all: CFLAGS += -O2
+ all: $(OUTPUT)
+ 
+ debug: CFLAGS += -g -O0
+@@ -78,19 +77,19 @@ strict: CFLAGS += -O2 -Werror -fsanitize=undefined -D_FORTIFY_SOURCE=2
+ strict: $(OUTPUT)
+ 
+ freq_nov.o: Makefile $(SRC_DIR)freq/freq_nov.c $(SRC_DIR)freq/freq_nov.h $(SRC_DIR)freq/freq.h
+-	$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -pthread $(SRC_DIR)freq/freq_nov.c -o $@
++	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) -c -pthread $(SRC_DIR)freq/freq_nov.c -o $@
+ 
+ freq_avx.o: Makefile $(SRC_DIR)freq/freq_avx.c $(SRC_DIR)freq/freq_avx.h $(SRC_DIR)freq/freq.h
+-	$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx -pthread $(SRC_DIR)freq/freq_avx.c -o $@
++	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) -c -mavx -pthread $(SRC_DIR)freq/freq_avx.c -o $@
+ 
+ freq_avx512.o: Makefile $(SRC_DIR)freq/freq_avx512.c $(SRC_DIR)freq/freq_avx512.h $(SRC_DIR)freq/freq.h
+-	$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx512f -pthread $(SRC_DIR)freq/freq_avx512.c -o $@
++	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) -c -mavx512f -pthread $(SRC_DIR)freq/freq_avx512.c -o $@
+ 
+ $(OUTPUT): Makefile $(SOURCE) $(HEADERS)
+ ifeq ($(GIT_VERSION),"")
+-	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
++	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) $(SOURCE) -o $(OUTPUT)
+ else
+-	$(CC) $(CFLAGS) $(SANITY_FLAGS) -DGIT_FULL_VERSION=\"$(GIT_VERSION)\" $(SOURCE) -o $(OUTPUT)
++	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) -DGIT_FULL_VERSION=\"$(GIT_VERSION)\" $(SOURCE) -o $(OUTPUT)
+ endif
+ 
+ run: $(OUTPUT)

diff --git a/app-misc/cpufetch/files/cpufetch-1.05-respect-ldflags.patch b/app-misc/cpufetch/files/cpufetch-1.05-respect-ldflags.patch
deleted file mode 100644
index 4ce2b712dc..0000000000
--- a/app-misc/cpufetch/files/cpufetch-1.05-respect-ldflags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Respect LDFLAGS.
---- a/Makefile
-+++ b/Makefile
-@@ -65,7 +65,6 @@ else
- 	OUTPUT=cpufetch.exe
- endif
- 
--all: CFLAGS += -O2
- all: $(OUTPUT)
- 
- debug: CFLAGS += -g -O0
-@@ -78,19 +77,19 @@ strict: CFLAGS += -O2 -Werror -fsanitize=undefined -D_FORTIFY_SOURCE=2
- strict: $(OUTPUT)
- 
- freq_nov.o: Makefile $(SRC_DIR)freq/freq_nov.c $(SRC_DIR)freq/freq_nov.h $(SRC_DIR)freq/freq.h
--	$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -pthread $(SRC_DIR)freq/freq_nov.c -o $@
-+	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) -c -pthread $(SRC_DIR)freq/freq_nov.c -o $@
- 
- freq_avx.o: Makefile $(SRC_DIR)freq/freq_avx.c $(SRC_DIR)freq/freq_avx.h $(SRC_DIR)freq/freq.h
--	$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx -pthread $(SRC_DIR)freq/freq_avx.c -o $@
-+	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) -c -mavx -pthread $(SRC_DIR)freq/freq_avx.c -o $@
- 
- freq_avx512.o: Makefile $(SRC_DIR)freq/freq_avx512.c $(SRC_DIR)freq/freq_avx512.h $(SRC_DIR)freq/freq.h
--	$(CC) $(CFLAGS) $(SANITY_FLAGS) -c -mavx512f -pthread $(SRC_DIR)freq/freq_avx512.c -o $@
-+	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) -c -mavx512f -pthread $(SRC_DIR)freq/freq_avx512.c -o $@
- 
- $(OUTPUT): Makefile $(SOURCE) $(HEADERS)
- ifeq ($(GIT_VERSION),"")
--	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
-+	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) $(SOURCE) -o $(OUTPUT)
- else
--	$(CC) $(CFLAGS) $(SANITY_FLAGS) -DGIT_FULL_VERSION=\"$(GIT_VERSION)\" $(SOURCE) -o $(OUTPUT)
-+	$(CC) $(CFLAGS) $(SANITY_FLAGS) $(LDFLAGS) -DGIT_FULL_VERSION=\"$(GIT_VERSION)\" $(SOURCE) -o $(OUTPUT)
- endif
- 
- run: $(OUTPUT)

next             reply	other threads:[~2024-02-08  9:57 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-08  9:57 Takuya Wakazono [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-02-06 12:23 [gentoo-commits] repo/proj/guru:dev commit in: app-misc/cpufetch/, app-misc/cpufetch/files/ Takuya Wakazono
2021-10-16 21:44 Alessandro Barbieri
2021-10-16 21:44 Alessandro Barbieri

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:25064201b dfblob:c5a2b3b0a dfblob:214920d8d dfblob:6bca12f1a
dfblob:e9969cd1b dfblob:4ce2b712d )
 OR (
bs:"[gentoo-commits] repo/proj/guru:dev commit in: app-misc/cpufetch/, app-misc/cpufetch/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1707385727.b1eb6e8859008366e45279fee8530546d164bf57.pastalian46@gentoo \
    --to=pastalian46@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox