commit: 8ab46aa3f5b981bcb40b8243b040bfa14d02c59a Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com> AuthorDate: Tue Feb 18 14:18:00 2025 +0000 Commit: David Roman <davidroman96 <AT> gmail <DOT> com> CommitDate: Tue Feb 18 14:18:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8ab46aa3
app-misc/cpufetch: add 1.06 Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com> app-misc/cpufetch/Manifest | 1 + app-misc/cpufetch/cpufetch-1.06.ebuild | 28 +++++++++ .../cpufetch/files/cpufetch-1.06-makefile.patch | 73 ++++++++++++++++++++++ 3 files changed, 102 insertions(+) diff --git a/app-misc/cpufetch/Manifest b/app-misc/cpufetch/Manifest index 8b9366d92..f6a577520 100644 --- a/app-misc/cpufetch/Manifest +++ b/app-misc/cpufetch/Manifest @@ -1 +1,2 @@ DIST cpufetch-1.05.tar.gz 2787010 BLAKE2B 3366635f1fd7a47979631aba92c3e7bdcfb66e71d446e2ac5b4361c47c4ba3054866d9a48ca4d81bfd580b49f7ba9e79e46616e216685dfad2e4e133b71274e0 SHA512 ec303e292ddc928e5cf2c81e0b38fd0853e1a3ffb9a20413e09677ec91777806c4774a0a6d618adde4f13328c930ce35a80e679609438542486999ab9e1308b4 +DIST cpufetch-1.06.tar.gz 2833392 BLAKE2B 552a4aec946da7ad70e92357b323582b29d81bd7eede6937809353b7f6e3008ef92bbc33f7ca8a24e6625d9f0145519113c3ef58ca4eb13782b90278e5242ba1 SHA512 ee907372608bed6af713f5e071e08a96c86cf0c7aeff1a7bf8511c2b03804d71e63d23e7aa409c2a7da5a0cf198a8a419e26210174f052c36bffa56135609d07 diff --git a/app-misc/cpufetch/cpufetch-1.06.ebuild b/app-misc/cpufetch/cpufetch-1.06.ebuild new file mode 100644 index 000000000..e486018e8 --- /dev/null +++ b/app-misc/cpufetch/cpufetch-1.06.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2025 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}-makefile.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.06-makefile.patch b/app-misc/cpufetch/files/cpufetch-1.06-makefile.patch new file mode 100644 index 000000000..f177588bc --- /dev/null +++ b/app-misc/cpufetch/files/cpufetch-1.06-makefile.patch @@ -0,0 +1,73 @@ +https://bugs.gentoo.org/924006 +Respect CFLAGS and LDFLAGS. +diff --git a/Makefile b/Makefile +index a4e5d13..2eb98c4 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,17 +30,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_COMMON)pci.c $(SRC_DIR)udev.c sve.o + HEADERS += $(COMMON_HDR) $(SRC_DIR)midr.h $(SRC_DIR)uarch.h $(SRC_COMMON)soc.h $(SRC_DIR)soc.h $(SRC_COMMON)pci.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 + + # Check if the compiler supports -march=armv8-a+sve. We will use it (if supported) to compile SVE detection code later + is_sve_flag_supported := $(shell $(CC) -march=armv8-a+sve -c $(SRC_DIR)sve.c -o sve_test.o 2> /dev/null && echo 'yes'; rm -f sve_test.o) +@@ -56,7 +56,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) +@@ -76,7 +76,6 @@ else + OUTPUT=cpufetch.exe + endif + +-all: CFLAGS += -O2 + all: $(OUTPUT) + + debug: CFLAGS += -g -O0 +@@ -89,22 +88,22 @@ 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 $@ + + sve.o: Makefile $(SRC_DIR)sve.c $(SRC_DIR)sve.h +- $(CC) $(CFLAGS) $(SANITY_FLAGS) $(SVE_FLAGS) -c $(SRC_DIR)sve.c -o $@ ++ $(CC) $(CFLAGS) $(SANITY_FLAGS) $(SVE_FLAGS) $(LDFLAGS) -c $(SRC_DIR)sve.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)
