summaryrefslogtreecommitdiff
path: root/sys-apps/x86info
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-07 01:33:16 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-07 01:33:16 +0100
commitc8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (patch)
tree3ee550255947da075650f1a551dcc278f9a1b7f8 /sys-apps/x86info
parenta978c074e4272bb901fbe4a10de0a7b2af574f17 (diff)
gentoo resync : 07.05.2021
Diffstat (limited to 'sys-apps/x86info')
-rw-r--r--sys-apps/x86info/Manifest2
-rw-r--r--sys-apps/x86info/files/x86info-1.30-makefile.patch36
2 files changed, 20 insertions, 18 deletions
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index 71d626b22723..4d8571bba827 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -1,4 +1,4 @@
-AUX x86info-1.30-makefile.patch 1939 BLAKE2B aadfe68d30fb12a71435e4ceb708cc69280c47d32e92d7ce0e95ca12199fe728bdbf2d3edfe4c296cf25a972df26e39355c0dd12a79cd4b1d8dc3c5680c4f6e9 SHA512 57ff52a78747abd75016b4b61a21e859c0b5023d5402d2025c7bd93e3a9511d291938da1c688e1eb60f912db64800140423d1e5ca19c159fc2d9c94dc97bc693
+AUX x86info-1.30-makefile.patch 2153 BLAKE2B d19254f4b1c3fcf18f570b88e729c4572f0ac1d3c7c92163c243427101066682befa29102ed3b5efa63aca7f4f0150eb50a8d2df3f91003942d51e51092ed9b8 SHA512 1dc4b5aeb280ee79e61ee6e979c59f2245b95688b6d0aed013202181810e6a5e55fb51c22b918213c86c0eb4dbc028f15db5d5ada325036680b0fba09223c09f
AUX x86info-1.30-pic.patch 512 BLAKE2B 968b592289df73700785d37b607693f1e43fbae18da878a9888ed02ba68f370b799d92dca1dc00c3c2fc1c2d1faeb9ee9278bc6c1b5ac5fc1f4ddfe5c7a4ca49 SHA512 578dfae0ea84e3836c73840981f9c95594acbeff264c914015be43ad30e3bbf6bbb268373de7871e1a10288749dba466f8511a452a76028cead53571dac8b1a4
AUX x86info-modules.conf-rc 204 BLAKE2B 1077f0a793ca7eedef6c996d2ec9075872d7df862d24885a8152ee22ef3e0ee1667f142a690b44c019c7d75093038ad5a9eb9be7b34e7bc08abf498aa91a7591 SHA512 54557bb1ee77749b7207ac886a31278ae003b52f5c4e76709c3a367e59ab0086872e8b39d30f018ad9d8b07d037a54b4817815880b5c9ebde106cad73421af6b
DIST x86info-1.30_p20190617.tar.gz 85913 BLAKE2B e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3 SHA512 352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6
diff --git a/sys-apps/x86info/files/x86info-1.30-makefile.patch b/sys-apps/x86info/files/x86info-1.30-makefile.patch
index 9e1768d68958..e513be7155aa 100644
--- a/sys-apps/x86info/files/x86info-1.30-makefile.patch
+++ b/sys-apps/x86info/files/x86info-1.30-makefile.patch
@@ -1,27 +1,17 @@
---- a/lsmsr/Makefile
-+++ b/lsmsr/Makefile
-@@ -40,7 +40,8 @@
- generic_msr.h
-
- %.h: %.regs createheader.py
-- @python createheader.py $< `basename $< .regs` >$@
-+ $(PYTHON) createheader.py $< `basename $< .regs` >$@.tmp ; \
-+ mv $@.tmp $@
-
- LSMSR_SRC = \
- lsmsr.c \
--- a/Makefile
+++ b/Makefile
-@@ -2,7 +2,7 @@
+@@ -1,8 +1,8 @@
+ VERSION=$(shell date +%Y-%m-%d)
- CFLAGS = -DVERSION="$(VERSION)"
+-CFLAGS = -DVERSION="$(VERSION)"
++CFLAGS += -DVERSION="$(VERSION)"
-CFLAGS += -Wall -W -g -O2 -D_FORTIFY_SOURCE=2 -I. -Iinclude
+CFLAGS += -Wall -W -I. -Iinclude
ifneq ($(SYSROOT),)
CFLAGS += --sysroot=$(SYSROOT)
endif
-@@ -18,7 +18,7 @@
+@@ -18,7 +18,7 @@ CFLAGS += -Wstrict-prototypes -Wmissing-prototypes
CFLAGS += -Wswitch-enum
CFLAGS += -Wundef
CFLAGS += -Wwrite-strings
@@ -30,7 +20,7 @@
# gcc specific
ifneq ($(shell $(CC) -v 2>&1 | grep -c "clang"), 1)
-@@ -33,20 +33,8 @@
+@@ -33,20 +33,8 @@ endif
CPP_MAJOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f1)
CPP_MINOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f2)
DEVEL := $(shell grep VERSION Makefile | head -n1 | grep pre | wc -l)
@@ -52,7 +42,7 @@
SHELL = /bin/sh
-@@ -68,15 +56,14 @@
+@@ -68,15 +56,14 @@ X86INFO_OBJS = $(sort $(patsubst %.c,%.o,$(wildcard *.c))) \
$(sort $(patsubst %.c,%.o,$(wildcard vendors/*/*.c)))
x86info: $(X86INFO_OBJS) $(X86INFO_HEADERS)
@@ -70,3 +60,15 @@
@mkdir -p $(DEPDIR)/$(*D)
@$(CC) -MM $(CFLAGS) $*.c > $(df).d
@mv -f $(df).d $(df).d.tmp
+--- a/lsmsr/Makefile
++++ b/lsmsr/Makefile
+@@ -40,7 +40,8 @@ LSMSR_TMP_HEADERS=AMD_k8.h \
+ generic_msr.h
+
+ %.h: %.regs createheader.py
+- @python createheader.py $< `basename $< .regs` >$@
++ $(PYTHON) createheader.py $< `basename $< .regs` >$@.tmp ; \
++ mv $@.tmp $@
+
+ LSMSR_SRC = \
+ lsmsr.c \