diff options
| author |   Conrad Kostecki <conrad@kostecki.com> | 2019-09-20 09:30:34 +0200 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2019-09-20 17:38:00 +0300 |
| commit | 7f44e80622ecdde9ec3728e9701a071450cd68f6 (patch) | |
| tree | 778c45f0c885f9ec6c3dac1f2f3bceb03b6a9cae /sys-apps/cpuid/files | |
| parent | net-wireless/unifi: bump to 5.11.47 (diff) | |
| download | gentoo-7f44e80622ecdde9ec3728e9701a071450cd68f6.tar.gz gentoo-7f44e80622ecdde9ec3728e9701a071450cd68f6.tar.bz2 gentoo-7f44e80622ecdde9ec3728e9701a071450cd68f6.zip | |
sys-apps/cpuid: bump to version 20180519
Also bumped to EAPI=7 and corrected license.
Closes: https://bugs.gentoo.org/645080
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'sys-apps/cpuid/files')
| -rw-r--r-- | sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch | 10 | ||||
| -rw-r--r-- | sys-apps/cpuid/files/cpuid-20180519-makefile.patch | 46 |
2 files changed, 56 insertions, 0 deletions
diff --git a/sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch b/sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch new file mode 100644 index 000000000000..7cb078fe7eca --- /dev/null +++ b/sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch @@ -0,0 +1,10 @@ +--- a/cpuid.c 2018-05-19 14:09:29.000000000 +0200 ++++ b/cpuid.c 2019-08-08 21:53:03.000000000 +0200 +@@ -4249,6 +4249,7 @@ + { "fast short REP MOV" , 4, 4, bools }, + { "PCONFIG" , 18, 18, bools }, + { "CET_IBT: CET indirect branch tracking" , 20, 20, bools }, ++ { "SPEC_CTRL: Speculation Control" , 26, 26, bools }, + }; + print_names(value, names, LENGTH(names, named_item), + /* max_len => */ 40); diff --git a/sys-apps/cpuid/files/cpuid-20180519-makefile.patch b/sys-apps/cpuid/files/cpuid-20180519-makefile.patch new file mode 100644 index 000000000000..e140c322fb19 --- /dev/null +++ b/sys-apps/cpuid/files/cpuid-20180519-makefile.patch @@ -0,0 +1,46 @@ +--- a/Makefile 2018-05-19 14:15:37.000000000 +0200 ++++ b/Makefile 2019-08-08 21:43:09.000000000 +0200 +@@ -1,4 +1,4 @@ +-CFLAGS+=-g ++CFLAGS+= + CPPFLAGS?= + LDFLAGS?= + ifneq (,$(findstring arch=i386,$(CFLAGS))) +@@ -36,7 +36,7 @@ + + BUILDROOT= + +-default: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz ++default: $(PROG) cpuinfo2cpuid cpuinfo2cpuid.man + + $(PROG): cpuid.c Makefile + $(CC) $(CFL) $(LDFLAGS) -o $@ cpuid.c +@@ -50,11 +50,11 @@ + cpuinfo2cpuid.man.gz: cpuinfo2cpuid.man + gzip < $< > $@ + +-install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz +- install -D -s -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG) +- install -D -m 444 $(PROG).man.gz $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz ++install: $(PROG) cpuinfo2cpuid ++ install -D -m 755 $(PROG) $(BUILDROOT)/usr/bin/$(PROG) ++ install -D -m 444 $(PROG).man $(BUILDROOT)/usr/share/man/man1/$(PROG).1 + install -D -m 755 cpuinfo2cpuid $(BUILDROOT)/usr/bin/cpuinfo2cpuid +- install -D -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz ++ install -D -m 444 cpuinfo2cpuid.man $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1 + + clean: + rm -f $(PROG) $(PROG).i386 $(PROG).x86_64 +@@ -71,10 +71,10 @@ + # Todd's Development rules + + $(PROG).i386: cpuid.c Makefile +- $(CC) -m32 -Wl,--hash-style=both $(CFL) $(LDFLAGS) -o $@ cpuid.c ++ $(CC) -m32 $(CFL) -o $@ cpuid.c + + $(PROG).x86_64: cpuid.c Makefile +- $(CC) -m64 $(CFL) $(LDFLAGS) -o $@ cpuid.c ++ $(CC) -m64 $(CFL) -o $@ cpuid.c + + todd: $(PROG).i386 $(PROG).x86_64 + rm -f ~/.bin/execs/i586/$(PROG) |