Update to 20161201

PR:		215023
Submitted by:	Piotr Kubaj <pkubaj@anongoth.pl> (maintainer)
This commit is contained in:
Jason E. Hale 2016-12-04 01:56:50 +00:00
parent 5de39ab5de
commit 2e7f3e3a98
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=427752
3 changed files with 17 additions and 9 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= cpuid PORTNAME= cpuid
PORTVERSION= 20161114 PORTVERSION= 20161201
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= http://www.etallen.com/cpuid/ MASTER_SITES= http://www.etallen.com/cpuid/
PKGNAMESUFFIX= ${CPUID_SUFFIX} PKGNAMESUFFIX= ${CPUID_SUFFIX}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1480199308 TIMESTAMP = 1480759691
SHA256 (cpuid-20161114.src.tar.gz) = 19564f068d0bc1a30d033476da89a9f348fd94b6dbfeae22dab7974514ffc3aa SHA256 (cpuid-20161201.src.tar.gz) = ef67c5a838448234c96cc16b5d38480adbd069ca094b1ba047af6b8e9b12c563
SIZE (cpuid-20161114.src.tar.gz) = 78758 SIZE (cpuid-20161201.src.tar.gz) = 78983

View file

@ -1,4 +1,4 @@
--- cpuid.c.orig 2016-11-14 01:57:53 UTC --- cpuid.c.orig 2016-11-30 14:34:23 UTC
+++ cpuid.c +++ cpuid.c
@@ -23,6 +23,8 @@ @@ -23,6 +23,8 @@
#define USE_KERNEL_SCHED_SETAFFINITY #define USE_KERNEL_SCHED_SETAFFINITY
@ -18,7 +18,15 @@
#ifdef USE_CPUID_MODULE #ifdef USE_CPUID_MODULE
#include <linux/major.h> #include <linux/major.h>
@@ -6471,11 +6475,16 @@ real_setup(unsigned int cpu, @@ -58,6 +62,7 @@ typedef const char* const ccstring;
#define XSTR(x) STR(x)
+#undef MAX
#define MAX(l,r) ((l) > (r) ? (l) : (r))
#define LENGTH(array, type) (sizeof(array) / sizeof(type))
@@ -6471,11 +6476,16 @@ real_setup(unsigned int cpu,
int status; int status;
status = syscall(__NR_sched_setaffinity, 0, sizeof(mask), &mask); status = syscall(__NR_sched_setaffinity, 0, sizeof(mask), &mask);
#else #else
@ -37,7 +45,7 @@
#endif #endif
if (status == -1) { if (status == -1) {
if (cpu > 0) { if (cpu > 0) {
@@ -6590,11 +6599,14 @@ static int real_get (int cpuid @@ -6590,11 +6600,14 @@ static int real_get (int cpuid
: "a" (reg), : "a" (reg),
"c" (ecx)); "c" (ecx));
} else { } else {
@ -55,7 +63,7 @@
if (result == -1) { if (result == -1) {
if (quiet) { if (quiet) {
return FALSE; return FALSE;
@@ -7134,7 +7146,7 @@ main(int argc, @@ -7138,7 +7151,7 @@ main(int argc,
}; };
boolean opt_one_cpu = FALSE; boolean opt_one_cpu = FALSE;
@ -64,7 +72,7 @@
boolean opt_kernel = FALSE; boolean opt_kernel = FALSE;
boolean opt_raw = FALSE; boolean opt_raw = FALSE;
boolean opt_debug = FALSE; boolean opt_debug = FALSE;
@@ -7264,7 +7276,8 @@ main(int argc, @@ -7268,7 +7281,8 @@ main(int argc,
} }
// Default to -i. So use inst unless -k is specified. // Default to -i. So use inst unless -k is specified.