diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-03 16:17:22 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-03 16:17:22 +0000 |
| commit | 4cd2370bed609c118b6edfde5d3f116e5c35b897 (patch) | |
| tree | ec58f2c41f49754e41521d5ebc9dce4597ddd0a5 /sys-apps/x86info/files | |
| parent | f443475c824b4b5c086e6d040961cb35ad81bc60 (diff) | |
gentoo resync : 03.12.2017
Diffstat (limited to 'sys-apps/x86info/files')
4 files changed, 19 insertions, 9 deletions
diff --git a/sys-apps/x86info/files/1.21-pic.patch b/sys-apps/x86info/files/1.21-pic.patch index ddf24b293e14..7bf89240c2c0 100644 --- a/sys-apps/x86info/files/1.21-pic.patch +++ b/sys-apps/x86info/files/1.21-pic.patch @@ -1,6 +1,5 @@ -diff -Nuar x86info-1.21.orig/bench/benchmarks.c x86info-1.21/bench/benchmarks.c ---- x86info-1.21.orig/bench/benchmarks.c 2007-11-26 17:53:58.278467889 -0800 -+++ x86info-1.21/bench/benchmarks.c 2007-11-26 17:54:32.014318066 -0800 +--- a/bench/benchmarks.c ++++ b/bench/benchmarks.c @@ -19,7 +19,10 @@ #ifdef __linux__ TIME(asm volatile("int $0x80" :"=a" (tmp) :"0" (__NR_getppid)), "int 0x80"); diff --git a/sys-apps/x86info/files/x86info-1.24-pic.patch b/sys-apps/x86info/files/x86info-1.24-pic.patch index 5cbd3a586f8e..b4098c5c68c2 100644 --- a/sys-apps/x86info/files/x86info-1.24-pic.patch +++ b/sys-apps/x86info/files/x86info-1.24-pic.patch @@ -1,7 +1,7 @@ http://bugs.gentoo.org/270388 ---- cpuid.c -+++ cpuid.c +--- a/cpuid.c ++++ b/cpuid.c @@ -62,12 +62,28 @@ sched_setaffinity(getpid(), sizeof(set), &set); } diff --git a/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch b/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch index 54208cab0843..a9cec0397fac 100644 --- a/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch +++ b/sys-apps/x86info/files/x86info-1.29-parallel-make-cleanup.patch @@ -1,12 +1,11 @@ -diff -Nuar x86info-1.29.orig/Makefile x86info-1.29/Makefile ---- x86info-1.29.orig/Makefile 2011-04-05 22:54:04.000000000 +0000 -+++ x86info-1.29/Makefile 2011-05-15 18:19:42.204228978 +0000 +--- a/Makefile ++++ b/Makefile @@ -12,7 +12,8 @@ LSMSR_TMP_HEADERS=AMD/k8.h AMD/fam10h.h AMD/fam11h.h generic_msr.h %.h: %.regs scripts/createheader.py - python scripts/createheader.py $< `basename $< .regs` >$@ -+ python scripts/createheader.py $< `basename $< .regs` >$@.tmp ; \ ++ $(PYTHON) scripts/createheader.py $< `basename $< .regs` >$@.tmp ; \ + mv $@.tmp $@ LSMSR_SRC = \ diff --git a/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch b/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch new file mode 100644 index 000000000000..21034d99edc5 --- /dev/null +++ b/sys-apps/x86info/files/x86info-1.30-fix-build-system.patch @@ -0,0 +1,12 @@ +--- a/Makefile ++++ b/Makefile +@@ -1,9 +1,5 @@ + VERSION=1.30 + +-CFLAGS = -g -O2 -Werror -Wall -Wshadow -Wextra -Wmissing-declarations -Wdeclaration-after-statement -Wredundant-decls +-LDFLAGS = -Wl,-z,relro,-z,now +-CC = gcc +- + SHELL = /bin/sh + + all: x86info test lsmsr |