| 1 |
commit: 71eb2d7f6095e1090dd170493e9dda3622b3c81d |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Wed May 5 11:29:10 2021 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 5 11:29:10 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71eb2d7f |
| 7 |
|
| 8 |
sys-apps/x86info: Respect CFLAGS |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/730204 |
| 11 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-apps/x86info/files/x86info-1.30-makefile.patch | 36 ++++++++++++---------- |
| 15 |
1 file changed, 19 insertions(+), 17 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/x86info/files/x86info-1.30-makefile.patch b/sys-apps/x86info/files/x86info-1.30-makefile.patch |
| 18 |
index 9e1768d6895..e513be7155a 100644 |
| 19 |
--- a/sys-apps/x86info/files/x86info-1.30-makefile.patch |
| 20 |
+++ b/sys-apps/x86info/files/x86info-1.30-makefile.patch |
| 21 |
@@ -1,27 +1,17 @@ |
| 22 |
---- a/lsmsr/Makefile |
| 23 |
-+++ b/lsmsr/Makefile |
| 24 |
-@@ -40,7 +40,8 @@ |
| 25 |
- generic_msr.h |
| 26 |
- |
| 27 |
- %.h: %.regs createheader.py |
| 28 |
-- @python createheader.py $< `basename $< .regs` >$@ |
| 29 |
-+ $(PYTHON) createheader.py $< `basename $< .regs` >$@.tmp ; \ |
| 30 |
-+ mv $@.tmp $@ |
| 31 |
- |
| 32 |
- LSMSR_SRC = \ |
| 33 |
- lsmsr.c \ |
| 34 |
--- a/Makefile |
| 35 |
+++ b/Makefile |
| 36 |
-@@ -2,7 +2,7 @@ |
| 37 |
+@@ -1,8 +1,8 @@ |
| 38 |
+ VERSION=$(shell date +%Y-%m-%d) |
| 39 |
|
| 40 |
- CFLAGS = -DVERSION="$(VERSION)" |
| 41 |
+-CFLAGS = -DVERSION="$(VERSION)" |
| 42 |
++CFLAGS += -DVERSION="$(VERSION)" |
| 43 |
|
| 44 |
-CFLAGS += -Wall -W -g -O2 -D_FORTIFY_SOURCE=2 -I. -Iinclude |
| 45 |
+CFLAGS += -Wall -W -I. -Iinclude |
| 46 |
ifneq ($(SYSROOT),) |
| 47 |
CFLAGS += --sysroot=$(SYSROOT) |
| 48 |
endif |
| 49 |
-@@ -18,7 +18,7 @@ |
| 50 |
+@@ -18,7 +18,7 @@ CFLAGS += -Wstrict-prototypes -Wmissing-prototypes |
| 51 |
CFLAGS += -Wswitch-enum |
| 52 |
CFLAGS += -Wundef |
| 53 |
CFLAGS += -Wwrite-strings |
| 54 |
@@ -30,7 +20,7 @@ |
| 55 |
|
| 56 |
# gcc specific |
| 57 |
ifneq ($(shell $(CC) -v 2>&1 | grep -c "clang"), 1) |
| 58 |
-@@ -33,20 +33,8 @@ |
| 59 |
+@@ -33,20 +33,8 @@ endif |
| 60 |
CPP_MAJOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f1) |
| 61 |
CPP_MINOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f2) |
| 62 |
DEVEL := $(shell grep VERSION Makefile | head -n1 | grep pre | wc -l) |
| 63 |
@@ -52,7 +42,7 @@ |
| 64 |
|
| 65 |
SHELL = /bin/sh |
| 66 |
|
| 67 |
-@@ -68,15 +56,14 @@ |
| 68 |
+@@ -68,15 +56,14 @@ X86INFO_OBJS = $(sort $(patsubst %.c,%.o,$(wildcard *.c))) \ |
| 69 |
$(sort $(patsubst %.c,%.o,$(wildcard vendors/*/*.c))) |
| 70 |
|
| 71 |
x86info: $(X86INFO_OBJS) $(X86INFO_HEADERS) |
| 72 |
@@ -70,3 +60,15 @@ |
| 73 |
@mkdir -p $(DEPDIR)/$(*D) |
| 74 |
@$(CC) -MM $(CFLAGS) $*.c > $(df).d |
| 75 |
@mv -f $(df).d $(df).d.tmp |
| 76 |
+--- a/lsmsr/Makefile |
| 77 |
++++ b/lsmsr/Makefile |
| 78 |
+@@ -40,7 +40,8 @@ LSMSR_TMP_HEADERS=AMD_k8.h \ |
| 79 |
+ generic_msr.h |
| 80 |
+ |
| 81 |
+ %.h: %.regs createheader.py |
| 82 |
+- @python createheader.py $< `basename $< .regs` >$@ |
| 83 |
++ $(PYTHON) createheader.py $< `basename $< .regs` >$@.tmp ; \ |
| 84 |
++ mv $@.tmp $@ |
| 85 |
+ |
| 86 |
+ LSMSR_SRC = \ |
| 87 |
+ lsmsr.c \ |
Archives