Date: Thu, 29 Dec 2022 00:41:31 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 96fd480838bf - main - sysutils/cpuid: bump to 20221201: Message-ID: <202212290041.2BT0fVtU011825@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=96fd480838bf8d944e59033ff177df5552a6011c commit 96fd480838bf8d944e59033ff177df5552a6011c Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2022-12-29 00:41:24 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2022-12-29 00:41:24 +0000 sysutils/cpuid: bump to 20221201: Differential revision: https://reviews.freebsd.org/D37774 Submitted by: mjg --- sysutils/cpuid/Makefile | 2 +- sysutils/cpuid/distinfo | 6 ++--- sysutils/cpuid/files/patch-cpuid.c | 49 -------------------------------------- 3 files changed, 4 insertions(+), 53 deletions(-) diff --git a/sysutils/cpuid/Makefile b/sysutils/cpuid/Makefile index ebc72ac95b7e..566f8c7b3365 100644 --- a/sysutils/cpuid/Makefile +++ b/sysutils/cpuid/Makefile @@ -1,5 +1,5 @@ PORTNAME= cpuid -DISTVERSION= 20211031 +DISTVERSION= 20221201 DISTVERSIONSUFFIX= .src CATEGORIES= sysutils MASTER_SITES= http://www.etallen.com/cpuid/ diff --git a/sysutils/cpuid/distinfo b/sysutils/cpuid/distinfo index 8a4b1a9daac1..d7cd2d693a10 100644 --- a/sysutils/cpuid/distinfo +++ b/sysutils/cpuid/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635787419 -SHA256 (cpuid-20211031.src.tar.gz) = 765d3336eb2e6f99765322e5f0f4e38c493c1c3c991e44c18ed73f9295585d8f -SIZE (cpuid-20211031.src.tar.gz) = 124390 +TIMESTAMP = 1672249029 +SHA256 (cpuid-20221201.src.tar.gz) = 08fedc382810667a9d0a417d2975de3ab5d81573452cff57b2deab06d82f8f6e +SIZE (cpuid-20221201.src.tar.gz) = 140185 diff --git a/sysutils/cpuid/files/patch-cpuid.c b/sysutils/cpuid/files/patch-cpuid.c deleted file mode 100644 index 9c048a24c81e..000000000000 --- a/sysutils/cpuid/files/patch-cpuid.c +++ /dev/null @@ -1,49 +0,0 @@ ---- cpuid.c.orig 2021-11-01 17:25:27 UTC -+++ cpuid.c -@@ -73,6 +73,8 @@ - #define USE_CPUID_COUNT - #endif - -+#define CPUID_MAJOR 0 -+ - #if defined(__GNUC__) - #define UNUSED __attribute((unused)) - #else -@@ -9485,12 +9487,17 @@ real_setup(unsigned int cpu, - pthread_t thread = pthread_self(); - int status = processor_bind(P_LWPID, thread, cpu, NULL); - #else -- cpu_set_t cpuset; -+ cpuset_t cpuset; - CPU_ZERO(&cpuset); - CPU_SET(cpu, &cpuset); - int status; -- status = sched_setaffinity(0, sizeof(cpu_set_t), &cpuset); -+#if defined(__FreeBSD__) -+ status = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -+ -1, sizeof(cpuset_t), &cpuset); -+#else -+ status = sched_setaffinity(0, sizeof(cpuset_t), &cpuset); - #endif -+#endif - if (status == -1) { - if (cpu > 0) { - if (errno == EINVAL) return -1; -@@ -9613,11 +9620,14 @@ static int real_get (int cpuid_fd, - "c" (ecx)); - #endif - } else { -- off64_t result; -- off64_t offset = ((off64_t)ecx << 32) + reg; -+// off64_t result; -+// off64_t offset = ((off64_t)ecx << 32) + reg; -+ int32_t result; -+ int32_t offset = (int32_t)ecx + reg; - int status; - -- result = lseek64(cpuid_fd, offset, SEEK_SET); -+// result = lseek64(cpuid_fd, offset, SEEK_SET); -+ result = lseek(cpuid_fd, offset, SEEK_SET); - if (result == -1) { - if (quiet) { - return FALSE;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212290041.2BT0fVtU011825>