mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-19 03:53:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

app-misc/cpufetch/files: fix patch

Browse Source 
Closes: https://bugs.gentoo.org/834743
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
This commit is contained in:
Alessandro Barbieri
2022-03-09 00:24:09 +01:00
parent 9d9dff76d2
commit 6448e836d5
2 changed files with 57 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app-misc/cpufetch/files/cpufetch-0.98-makefile.patch
View File

@@ -1,30 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,4 @@
-CC ?= gcc
-
-CFLAGS+=-Wall -Wextra -pedantic -fstack-protector-all -pedantic -std=c99
+CFLAGS+=-Wall -Wextra -pedantic -std=c99
SANITY_FLAGS=-Wfloat-equal -Wshadow -Wpointer-arith
PREFIX ?= /usr
@@ -35,17 +33,15 @@
OUTPUT=cpufetch.exe
endif
-all: CFLAGS += -O3
all: $(OUTPUT)
-debug: CFLAGS += -g -O0
debug: $(OUTPUT)
-static: CFLAGS += -static -O3
+static: CFLAGS += -static
static: $(OUTPUT)
$(OUTPUT): Makefile $(SOURCE) $(HEADERS)
- $(CC) $(CFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
+ $(CC) $(CFLAGS) $(LDFLAGS) $(SANITY_FLAGS) $(SOURCE) -o $(OUTPUT)
run: $(OUTPUT)
./$(OUTPUT)

57
app-misc/cpufetch/files/cpufetch-1.01-makefile.patch Normal file
View File

@@ -0,0 +1,57 @@
--- 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)