* [gentoo-commits] repo/proj/guru:dev commit in: app-misc/cpufetch/, app-misc/cpufetch/files/
@ 2021-10-16 21:44 Alessandro Barbieri
0 siblings, 0 replies; 4+ messages in thread
From: Alessandro Barbieri @ 2021-10-16 21:44 UTC (permalink / raw
To: gentoo-commits
commit: 703d5c515d1cb8d6ba6b4b051f3bca33bec41070
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Oct 16 21:43:49 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sat Oct 16 21:44:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=703d5c51
app-misc/cpufetch: add 1.00
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
app-misc/cpufetch/Manifest | 1 +
app-misc/cpufetch/cpufetch-1.00.ebuild | 29 ++++++++++++
.../cpufetch/files/cpufetch-1.00-makefile.patch | 51 ++++++++++++++++++++++
3 files changed, 81 insertions(+)
diff --git a/app-misc/cpufetch/Manifest b/app-misc/cpufetch/Manifest
index a10492fa8..6e4de58e0 100644
--- a/app-misc/cpufetch/Manifest
+++ b/app-misc/cpufetch/Manifest
@@ -1,2 +1,3 @@
DIST cpufetch-0.94_p20210409.tar.gz 303151 BLAKE2B 0ad4d19e1cf07cf9692af4c81183ce7727eaf3638907e812b288070e325a9b8b2f39af611db5eb19a069935ac60238b234173ee20138d8744e919c7c53e68609 SHA512 2f914f37a84e8a43b80770ad4e1b4e7d3679a17a50330198e1d8bb0faff3485a0e667735b5bdf01317d99851530f01165fe80b789059b8668d42d595386e44fd
DIST cpufetch-0.98.tar.gz 304203 BLAKE2B 71376f29337ac981aba993a74259e555d34ae6df0f8a2e04e7659608f2bae18fa6af4c31349601b7347566fd3d4c2ffa7cbf1752bc2b16b6513747201d2a2835 SHA512 e862a0b6472d4942a58359b203037391747f74d991ea71e77a64369695f39e3d9ab8d60c5888703683ce5258426f5211f9e54863649ad796e08c083888d9b076
+DIST cpufetch-1.00.tar.gz 317439 BLAKE2B 8fdf21bebfd6d2ef760cc388b6da2d5c0665964ebcad2537e06c1bede40fffb151a5e37665ab52f2ec31f48a25c3aeb895e820b03ab7ec37d50a85e1bdce3a2b SHA512 94be5c5aacf9e5cde4fd4e4b14e433db523821fc27466c599e34c062ca32145edb0c8f84168e07c8a64f591fee1f5ab704d569bb70c53b7523d52f4882b573a1
diff --git a/app-misc/cpufetch/cpufetch-1.00.ebuild b/app-misc/cpufetch/cpufetch-1.00.ebuild
new file mode 100644
index 000000000..4da777c47
--- /dev/null
+++ b/app-misc/cpufetch/cpufetch-1.00.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simplistic yet fancy CPU architecture fetching tool"
+HOMEPAGE="https://github.com/Dr-Noob/cpufetch"
+SRC_URI="https://github.com/Dr-Noob/cpufetch/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+
+src_prepare() {
+ default
+ export CC=$(tc-getCC)
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+ newdoc README.md README
+ dodoc -r doc/.
+}
diff --git a/app-misc/cpufetch/files/cpufetch-1.00-makefile.patch b/app-misc/cpufetch/files/cpufetch-1.00-makefile.patch
new file mode 100644
index 000000000..a34ed4026
--- /dev/null
+++ b/app-misc/cpufetch/files/cpufetch-1.00-makefile.patch
@@ -0,0 +1,51 @@
+--- a/Makefile 2021-08-23 09:31:46.000000000 +0200
++++ b/Makefile 2021-10-16 23:40:53.698941777 +0200
+@@ -1,4 +1,3 @@
+-CC ?= gcc
+
+ CFLAGS+=-Wall -Wextra -pedantic
+ SANITY_FLAGS=-Wfloat-equal -Wshadow -Wpointer-arith
+@@ -16,17 +15,17 @@
+ SRC_DIR=src/x86/
+ SOURCE += $(COMMON_SRC) $(SRC_DIR)cpuid.c $(SRC_DIR)apic.c $(SRC_DIR)cpuid_asm.c $(SRC_DIR)uarch.c
+ HEADERS += $(COMMON_HDR) $(SRC_DIR)cpuid.h $(SRC_DIR)apic.h $(SRC_DIR)cpuid_asm.h $(SRC_DIR)uarch.h
+- 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)
+@@ -51,20 +50,17 @@
+ OUTPUT=cpufetch.exe
+ endif
+
+-all: CFLAGS += -O3
+ all: $(OUTPUT)
+
+-debug: CFLAGS += -g -O0
+ debug: $(OUTPUT)
+
+-static: CFLAGS += -static -O3
++static: CFLAGS += -static
+ static: $(OUTPUT)
+
+-strict: CFLAGS += -O3 -Werror -fsanitize=undefined -D_FORTIFY_SOURCE=2
+ strict: $(OUTPUT)
+
+ $(OUTPUT): Makefile $(SOURCE) $(HEADERS)
+- $(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
++ $(CC) $(CFLAGS) $(LDFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
+
+ run: $(OUTPUT)
+ ./$(OUTPUT)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-misc/cpufetch/, app-misc/cpufetch/files/
@ 2021-10-16 21:44 Alessandro Barbieri
0 siblings, 0 replies; 4+ messages in thread
From: Alessandro Barbieri @ 2021-10-16 21:44 UTC (permalink / raw
To: gentoo-commits
commit: 2f0c2254f67ce8fed4e6f5b678f737f9823bceb4
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sat Oct 16 21:44:26 2021 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sat Oct 16 21:44:45 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2f0c2254
app-misc/cpufetch: drop 0.94_p20210409
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
app-misc/cpufetch/Manifest | 1 -
app-misc/cpufetch/cpufetch-0.94_p20210409.ebuild | 29 ----------------------
.../cpufetch/files/makefile-0.94_p20210409.patch | 26 -------------------
3 files changed, 56 deletions(-)
diff --git a/app-misc/cpufetch/Manifest b/app-misc/cpufetch/Manifest
index 6e4de58e0..2c9a0d3c4 100644
--- a/app-misc/cpufetch/Manifest
+++ b/app-misc/cpufetch/Manifest
@@ -1,3 +1,2 @@
-DIST cpufetch-0.94_p20210409.tar.gz 303151 BLAKE2B 0ad4d19e1cf07cf9692af4c81183ce7727eaf3638907e812b288070e325a9b8b2f39af611db5eb19a069935ac60238b234173ee20138d8744e919c7c53e68609 SHA512 2f914f37a84e8a43b80770ad4e1b4e7d3679a17a50330198e1d8bb0faff3485a0e667735b5bdf01317d99851530f01165fe80b789059b8668d42d595386e44fd
DIST cpufetch-0.98.tar.gz 304203 BLAKE2B 71376f29337ac981aba993a74259e555d34ae6df0f8a2e04e7659608f2bae18fa6af4c31349601b7347566fd3d4c2ffa7cbf1752bc2b16b6513747201d2a2835 SHA512 e862a0b6472d4942a58359b203037391747f74d991ea71e77a64369695f39e3d9ab8d60c5888703683ce5258426f5211f9e54863649ad796e08c083888d9b076
DIST cpufetch-1.00.tar.gz 317439 BLAKE2B 8fdf21bebfd6d2ef760cc388b6da2d5c0665964ebcad2537e06c1bede40fffb151a5e37665ab52f2ec31f48a25c3aeb895e820b03ab7ec37d50a85e1bdce3a2b SHA512 94be5c5aacf9e5cde4fd4e4b14e433db523821fc27466c599e34c062ca32145edb0c8f84168e07c8a64f591fee1f5ab704d569bb70c53b7523d52f4882b573a1
diff --git a/app-misc/cpufetch/cpufetch-0.94_p20210409.ebuild b/app-misc/cpufetch/cpufetch-0.94_p20210409.ebuild
deleted file mode 100644
index 6f68bb6dd..000000000
--- a/app-misc/cpufetch/cpufetch-0.94_p20210409.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-COMMIT="8f2f3d3a1652b87162f763a88a5070cf25c2e6d7"
-DESCRIPTION="Simplistic yet fancy CPU architecture fetching tool"
-HOMEPAGE="https://github.com/Dr-Noob/cpufetch"
-SRC_URI="https://github.com/Dr-Noob/cpufetch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-PATCHES=( "${FILESDIR}/makefile-${PV}.patch" )
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
- default
- export CC=$(tc-getCC)
-}
-
-src_install() {
- dobin "${PN}"
- doman "${PN}.8"
- newdoc README.md README
- dodoc -r doc/.
-}
diff --git a/app-misc/cpufetch/files/makefile-0.94_p20210409.patch b/app-misc/cpufetch/files/makefile-0.94_p20210409.patch
deleted file mode 100644
index 175ea34ce..000000000
--- a/app-misc/cpufetch/files/makefile-0.94_p20210409.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/Makefile 2021-04-11 04:01:08.508885689 +0200
-+++ b/Makefile 2021-04-11 04:02:33.680269181 +0200
-@@ -1,6 +1,4 @@
--CC=gcc
--
--CFLAGS=-Wall -Wextra -Werror -pedantic -fstack-protector-all -pedantic -std=c99
-+CFLAGS+=-Wall -Wextra -pedantic -std=c99
- SANITY_FLAGS=-Wfloat-equal -Wshadow -Wpointer-arith
-
- PREFIX ?= /usr
-@@ -37,14 +35,12 @@
-
- all: $(OUTPUT)
-
--debug: CFLAGS += -g -O0
- debug: $(OUTPUT)
-
--release: CFLAGS += -static -O3
- release: $(OUTPUT)
-
- $(OUTPUT): Makefile $(SOURCE) $(HEADERS)
-- $(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
-
- run: $(OUTPUT)
- ./$(OUTPUT)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-misc/cpufetch/, app-misc/cpufetch/files/
@ 2024-02-06 12:23 Takuya Wakazono
0 siblings, 0 replies; 4+ messages in thread
From: Takuya Wakazono @ 2024-02-06 12:23 UTC (permalink / raw
To: gentoo-commits
commit: 12d362ca1aa6c5b7c00305cbee99889996a86b77
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Tue Feb 6 12:22:11 2024 +0000
Commit: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
CommitDate: Tue Feb 6 12:23:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=12d362ca
app-misc/cpufetch: add 1.05
Closes: https://bugs.gentoo.org/901031
Closes: https://bugs.gentoo.org/907341
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
app-misc/cpufetch/Manifest | 1 +
app-misc/cpufetch/cpufetch-1.05.ebuild | 28 +++++++++++++++++
.../files/cpufetch-1.05-respect-ldflags.patch | 36 ++++++++++++++++++++++
3 files changed, 65 insertions(+)
diff --git a/app-misc/cpufetch/Manifest b/app-misc/cpufetch/Manifest
index bfe51ce66a..612fabbab5 100644
--- a/app-misc/cpufetch/Manifest
+++ b/app-misc/cpufetch/Manifest
@@ -1,3 +1,4 @@
DIST cpufetch-1.01.tar.gz 2759620 BLAKE2B 4d16cc0b1be94706b3e5d9481a2846d8c90807b792212389e7159739952d8df3f3cc02f6e828e53fe17a51ecba4370a273c5152c0af237fa0cededac88c76e3f SHA512 069580b6dd548af394c28b74af72b2979be16a69879c51c42e2f26611ea8bf78412bedb6bbc6ddbfd2f98f8b26f930cc2d8afcc81e4d6494c382cfec9de771c1
DIST cpufetch-1.02.tar.gz 2767499 BLAKE2B 041ac6ac304faa6fb2cc71fb4841d8e9a263d57ae6b79e0d6cdcf5149fd6bf0e89135f9f7eeaf25681d4a4ad73861d2eb45883cee1626b0cfa1bc21957110e44 SHA512 b548af4dccd632c2899a3b0fd70e67f7abdc4bd66371927876c851168d0df47e23bd8f798d82509b83b268c50b0e9a6697a56f6fcf7772711108e2538cd1c09a
DIST cpufetch-1.04.tar.gz 2779927 BLAKE2B 9e8a5f205344cfadf4893a2d4bd1564267ca21f1a14e5b7c99be6eaf519aca13bee0086ee8db6b584a86324b79e8496704c92850b4f7069fc4a749acaa91c8a6 SHA512 06c41439f033309ef31eafe576fb797d9f68900026ec2e01545a0ace0abdeb9dfa19865fe3aa3ab5f40ea1a5fb70ea672e114d5e65257ac04aa28a42acfdfb45
+DIST cpufetch-1.05.tar.gz 2787010 BLAKE2B 3366635f1fd7a47979631aba92c3e7bdcfb66e71d446e2ac5b4361c47c4ba3054866d9a48ca4d81bfd580b49f7ba9e79e46616e216685dfad2e4e133b71274e0 SHA512 ec303e292ddc928e5cf2c81e0b38fd0853e1a3ffb9a20413e09677ec91777806c4774a0a6d618adde4f13328c930ce35a80e679609438542486999ab9e1308b4
diff --git a/app-misc/cpufetch/cpufetch-1.05.ebuild b/app-misc/cpufetch/cpufetch-1.05.ebuild
new file mode 100644
index 0000000000..25064201b9
--- /dev/null
+++ b/app-misc/cpufetch/cpufetch-1.05.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simplistic yet fancy CPU architecture fetching tool"
+HOMEPAGE="https://github.com/Dr-Noob/cpufetch"
+SRC_URI="https://github.com/Dr-Noob/cpufetch/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+PATCHES=( "${FILESDIR}/${P}-respect-ldflags.patch" )
+
+src_prepare() {
+ default
+ tc-export CC
+}
+
+src_install() {
+ dobin "${PN}"
+ doman "${PN}.1"
+ newdoc README.md README
+ dodoc -r doc/.
+}
diff --git a/app-misc/cpufetch/files/cpufetch-1.05-respect-ldflags.patch b/app-misc/cpufetch/files/cpufetch-1.05-respect-ldflags.patch
new file mode 100644
index 0000000000..4ce2b712dc
--- /dev/null
+++ b/app-misc/cpufetch/files/cpufetch-1.05-respect-ldflags.patch
@@ -0,0 +1,36 @@
+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)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: app-misc/cpufetch/, app-misc/cpufetch/files/
@ 2024-02-08 9:57 Takuya Wakazono
0 siblings, 0 replies; 4+ messages in thread
From: Takuya Wakazono @ 2024-02-08 9:57 UTC (permalink / raw
To: gentoo-commits
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)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-08 9:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-08 9:57 [gentoo-commits] repo/proj/guru:dev commit in: app-misc/cpufetch/, app-misc/cpufetch/files/ Takuya Wakazono
-- strict thread matches above, loose matches on Subject: below --
2024-02-06 12:23 Takuya Wakazono
2021-10-16 21:44 Alessandro Barbieri
2021-10-16 21:44 Alessandro Barbieri
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox