pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
cpuinfo: remove, used for updating sysutils/cpuinfo
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Tue Aug 5 16:17:50 2025 +0200
Changeset: a0cb2335586a60f82342c940e24b31385b46f2c5
Modified Files:
Makefile
svt-av1/Makefile
Removed Files:
cpuinfo/DESCR
cpuinfo/Makefile
cpuinfo/PLIST
cpuinfo/buildlink3.mk
cpuinfo/distinfo
cpuinfo/patches/patch-CMakeLists.txt
cpuinfo/patches/patch-src_freebsd_topology.c
cpuinfo/patches/patch-src_init.c
Log Message:
cpuinfo: remove, used for updating sysutils/cpuinfo
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a0cb2335586a60f82342c940e24b31385b46f2c5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 2 +-
cpuinfo/DESCR | 2 -
cpuinfo/Makefile | 50 ------------------------
cpuinfo/PLIST | 21 ----------
cpuinfo/buildlink3.mk | 14 -------
cpuinfo/distinfo | 14 -------
cpuinfo/patches/patch-CMakeLists.txt | 57 ----------------------------
cpuinfo/patches/patch-src_freebsd_topology.c | 51 -------------------------
cpuinfo/patches/patch-src_init.c | 16 --------
svt-av1/Makefile | 2 +-
10 files changed, 2 insertions(+), 227 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 76ce4dfd5c..af1aa8cfe1 100644
--- a/Makefile
+++ b/Makefile
@@ -593,7 +593,6 @@ SUBDIR+= cpdup
SUBDIR+= cpluff
SUBDIR+= cpm
SUBDIR+= cpqarrayd
-SUBDIR+= cpuinfo
SUBDIR+= cpuminer-multi
SUBDIR+= cqlsh
SUBDIR+= crchack-git
@@ -5525,6 +5524,7 @@ SUBDIR+= svgalib64
SUBDIR+= svkbd
SUBDIR+= svnup
SUBDIR+= svrcore
+SUBDIR+= svt-av1
SUBDIR+= svt-vp9
SUBDIR+= swami
SUBDIR+= swarp
diff --git a/cpuinfo/DESCR b/cpuinfo/DESCR
deleted file mode 100644
index e3ce34806f..0000000000
--- a/cpuinfo/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-cpuinfo is a library to detect essential for performance optimization
-information about host CPU.
diff --git a/cpuinfo/Makefile b/cpuinfo/Makefile
deleted file mode 100644
index c30fb268ba..0000000000
--- a/cpuinfo/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: Makefile,v 1.1 2025/02/23 21:54:05 wiz Exp $
-
-DISTNAME= cpuinfo-0.0.20250724
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_GITHUB:=pytorch/}
-GITHUB_TAG= 33ed0be77d7767d0e2010e2c3cf972ef36c7c307
-DISTFILES= ${DEFAULT_DISTFILES}
-DISTFILES+= benchmark-1.6.1.tar.gz
-SITES.benchmark-1.6.1.tar.gz= \
- -${MASTER_SITE_GITHUB:=google/}benchmark/archive/v1.6.1.tar.gz
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= https://github.com/pytorch/cpuinfo/
-COMMENT= CPU information library
-LICENSE= 2-clause-bsd
-
-USE_LANGUAGES+= c c++
-USE_CXX_FEATURES+= c++17
-FORCE_CXX_STD= c++17
-USE_TOOLS+= pkg-config
-
-PKGCONFIG_OVERRIDE= libcpuinfo.pc.in
-CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_GOOGLETEST=ON
-#CMAKE_CONFIGURE_ARGS+= -DUSE_SYSTEM_LIBS=ON
-CMAKE_CONFIGURE_ARGS+= -DGOOGLEBENCHMARK_SOURCE_DIR=deps/googlebenchmark
-
-post-extract:
- ${MV} ${WRKDIR}/benchmark-1.6.1 ${WRKSRC}/deps/googlebenchmark
-
-post-install:
-.for file in \
- include/benchmark/benchmark.h \
- lib/cmake/benchmark/benchmarkConfig.cmake \
- lib/cmake/benchmark/benchmarkConfigVersion.cmake \
- lib/cmake/benchmark/benchmarkTargets-noconfig.cmake \
- lib/cmake/benchmark/benchmarkTargets.cmake \
- lib/libbenchmark.a \
- lib/libbenchmark_main.a \
- lib/pkgconfig/benchmark.pc
- ${RM} ${DESTDIR}${PREFIX}/${file}
-.endfor
-
-
-.include "../../devel/cmake/build.mk"
-# Can't use
-#.include "../../benchmarks/google-benchmark/buildlink3.mk"
-# because of
-# https://github.com/pytorch/cpuinfo/issues/313
-.include "../../devel/googletest/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/cpuinfo/PLIST b/cpuinfo/PLIST
deleted file mode 100644
index 9744015d4e..0000000000
--- a/cpuinfo/PLIST
+++ /dev/null
@@ -1,21 +0,0 @@
-@comment $NetBSD$
-bin/cache-info
-bin/cpu-info
-bin/cpuid-dump
-bin/isa-info
-include/cpuinfo.h
-lib/libcpuinfo.a
-lib/pkgconfig/libcpuinfo.pc
-share/cpuinfo/cpuinfo-config.cmake
-share/cpuinfo/cpuinfo-targets-noconfig.cmake
-share/cpuinfo/cpuinfo-targets.cmake
-share/doc/cpuinfo/AssemblyTests.md
-share/doc/cpuinfo/_config.yml
-share/doc/cpuinfo/dependencies.md
-share/doc/cpuinfo/index.md
-share/doc/cpuinfo/perf_counters.md
-share/doc/cpuinfo/platform_specific_build_instructions.md
-share/doc/cpuinfo/random_interleaving.md
-share/doc/cpuinfo/releasing.md
-share/doc/cpuinfo/tools.md
-share/doc/cpuinfo/user_guide.md
diff --git a/cpuinfo/buildlink3.mk b/cpuinfo/buildlink3.mk
deleted file mode 100644
index a794ab2b94..0000000000
--- a/cpuinfo/buildlink3.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2025/02/23 21:54:05 wiz Exp $
-
-BUILDLINK_TREE+= cpuinfo
-
-.if !defined(CPUINFO_BUILDLINK3_MK)
-CPUINFO_BUILDLINK3_MK:=
-
-BUILDLINK_DEPMETHOD.cpuinfo?= build
-
-BUILDLINK_API_DEPENDS.cpuinfo+= cpuinfo>=0.0.20250219
-BUILDLINK_PKGSRCDIR.cpuinfo?= ../../wip/cpuinfo
-.endif # CPUINFO_BUILDLINK3_MK
-
-BUILDLINK_TREE+= -cpuinfo
diff --git a/cpuinfo/distinfo b/cpuinfo/distinfo
deleted file mode 100644
index ad3ffe4180..0000000000
--- a/cpuinfo/distinfo
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: distinfo,v 1.1 2025/02/23 21:54:05 wiz Exp $
-
-BLAKE2s (benchmark-1.6.1.tar.gz) = e1d824a20befda52931de3256cbf065724b076fdf4d6feb8b101e56d283f8418
-SHA512 (benchmark-1.6.1.tar.gz) = 7d3e3baf5a2d92e9552ab5007c37253b3510ac269edf8922a2794ff3dfbd0bf5b4c519240d4577b1ec30ef9e8a64caa17a809054c3dc7f2b1bcd410596177d67
-Size (benchmark-1.6.1.tar.gz) = 184616 bytes
-BLAKE2s (cpuinfo-0.0.20250724-33ed0be77d7767d0e2010e2c3cf972ef36c7c307.tar.gz) = 501c3de724c1420111f2784fb470e6371239286fddb2f4962bacf7c5619b7d84
-SHA512 (cpuinfo-0.0.20250724-33ed0be77d7767d0e2010e2c3cf972ef36c7c307.tar.gz) = 41775802b5a33f1bb0cb2c5dd126180e25d281a57c934d94247130c31ec7bf1dbf269ed9e8e946be1bdeeb09f0c17fee42048f71b4beb44c65df18cfb0cddc3b
-Size (cpuinfo-0.0.20250724-33ed0be77d7767d0e2010e2c3cf972ef36c7c307.tar.gz) = 3546678 bytes
-BLAKE2s (googletest-1.11.0.tar.gz) = 0b546cc02c7a8d6e15337b5dde02e2ff1c17bb5232212cba0b665ad47ff51eac
-SHA512 (googletest-1.11.0.tar.gz) = 6fcc7827e4c4d95e3ae643dd65e6c4fc0e3d04e1778b84f6e06e390410fe3d18026c131d828d949d2f20dde6327d30ecee24dcd3ef919e21c91e010d149f3a28
-Size (googletest-1.11.0.tar.gz) = 886330 bytes
-SHA1 (patch-CMakeLists.txt) = ec8a0d584d00540102d50b436f251fbf6521259e
-SHA1 (patch-src_freebsd_topology.c) = 4561cabdbad0765d63c6822d9ee3dfd5235592f2
-SHA1 (patch-src_init.c) = 8a516a15d55b7fb1c9cf505d4dcaf5320775fb4a
diff --git a/cpuinfo/patches/patch-CMakeLists.txt b/cpuinfo/patches/patch-CMakeLists.txt
deleted file mode 100644
index 1d5219c3f3..0000000000
--- a/cpuinfo/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD$
-
-Add basic NetBSD support.
-https://github.com/pytorch/cpuinfo/pull/315
-
---- CMakeLists.txt.orig 2025-07-24 17:36:24.000000000 +0000
-+++ CMakeLists.txt
-@@ -67,7 +67,7 @@ ENDIF()
-
- # -- [ Determine target processor
- SET(CPUINFO_TARGET_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
--IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" AND CPUINFO_TARGET_PROCESSOR STREQUAL "amd64")
-+IF(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|NetBSD)" AND CPUINFO_TARGET_PROCESSOR STREQUAL "amd64")
- SET(CPUINFO_TARGET_PROCESSOR "AMD64")
- ENDIF()
- IF(IS_APPLE_OS AND CMAKE_OSX_ARCHITECTURES MATCHES "^(x86_64|arm64.*)$")
-@@ -108,7 +108,7 @@ IF(NOT CMAKE_SYSTEM_NAME)
- "Target operating system is not specified. "
- "cpuinfo will compile, but cpuinfo_initialize() will always fail.")
- SET(CPUINFO_SUPPORTED_PLATFORM FALSE)
--ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|Android|FreeBSD|Emscripten)$")
-+ELSEIF(NOT CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS|Darwin|Linux|Android|FreeBSD|NetBSD|Emscripten)$")
- IF(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14" AND NOT IS_APPLE_OS)
- MESSAGE(WARNING
- "Target operating system \"${CMAKE_SYSTEM_NAME}\" is not supported in cpuinfo. "
-@@ -181,7 +181,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
- LIST(APPEND CPUINFO_SRCS src/x86/mach/init.c)
- ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^(Windows|WindowsStore|CYGWIN|MSYS)$")
- LIST(APPEND CPUINFO_SRCS src/x86/windows/init.c)
-- ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|NetBSD)")
- LIST(APPEND CPUINFO_SRCS src/x86/freebsd/init.c)
- ENDIF()
- ELSEIF(CMAKE_SYSTEM_NAME MATCHES "^Windows" AND CPUINFO_TARGET_PROCESSOR MATCHES "^(ARM64|arm64)$")
-@@ -240,11 +240,11 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
- src/linux/processors.c)
- ELSEIF(IS_APPLE_OS)
- LIST(APPEND CPUINFO_SRCS src/mach/topology.c)
-- ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|NetBSD)")
- LIST(APPEND CPUINFO_SRCS src/freebsd/topology.c)
- ENDIF()
-
-- IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ IF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android" OR CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|NetBSD)")
- SET(CMAKE_THREAD_PREFER_PTHREAD TRUE)
- SET(THREADS_PREFER_PTHREAD_FLAG TRUE)
- FIND_PACKAGE(Threads REQUIRED)
-@@ -309,7 +309,7 @@ IF(CPUINFO_SUPPORTED_PLATFORM)
- TARGET_LINK_LIBRARIES(cpuinfo_internals PUBLIC ${CMAKE_THREAD_LIBS_INIT})
- TARGET_COMPILE_DEFINITIONS(cpuinfo PRIVATE _GNU_SOURCE=1)
- TARGET_COMPILE_DEFINITIONS(cpuinfo_internals PRIVATE _GNU_SOURCE=1)
-- ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-+ ELSEIF(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|NetBSD)")
- TARGET_LINK_LIBRARIES(cpuinfo PUBLIC ${CMAKE_THREAD_LIBS_INIT})
- TARGET_LINK_LIBRARIES(cpuinfo_internals PUBLIC ${CMAKE_THREAD_LIBS_INIT})
- ENDIF()
diff --git a/cpuinfo/patches/patch-src_freebsd_topology.c b/cpuinfo/patches/patch-src_freebsd_topology.c
deleted file mode 100644
index 475532d9bf..0000000000
--- a/cpuinfo/patches/patch-src_freebsd_topology.c
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD$
-
-Add basic NetBSD support.
-https://github.com/pytorch/cpuinfo/pull/315
-
---- src/freebsd/topology.c.orig 2025-07-24 17:36:24.000000000 +0000
-+++ src/freebsd/topology.c
-@@ -20,6 +20,7 @@ static int sysctl_int(const char* name)
- return value;
- }
-
-+#if defined(__FreeBSD__)
- static char* sysctl_str(const char* name) {
- size_t value_size = 0;
- if (sysctlbyname(name, NULL, &value_size, NULL, 0) != 0) {
-@@ -42,6 +43,7 @@ static char* sysctl_str(const char* name
- }
- return value;
- }
-+#endif
-
- struct cpuinfo_freebsd_topology cpuinfo_freebsd_detect_topology(void) {
- struct cpuinfo_freebsd_topology topology = {
-@@ -50,6 +52,7 @@ struct cpuinfo_freebsd_topology cpuinfo_
- .threads_per_core = 0,
- .threads = 0,
- };
-+#if defined (__FreeBSD__)
- char* topology_spec = sysctl_str("kern.sched.topology_spec");
- if (!topology_spec) {
- return topology;
-@@ -94,6 +97,19 @@ struct cpuinfo_freebsd_topology cpuinfo_
- topology.threads_per_core);
- topology.threads = topology.threads_per_core * topology.cores;
- return topology;
-+#elif defined(__NetBSD__)
-+ topology.cores = sysctl_int("hw.ncpu");
-+ if (topology.cores == 0) {
-+ goto fail;
-+ }
-+ cpuinfo_log_debug("netbsd topology: cores = %d", topology.cores);
-+ /* more details need active identification of the CPU, no sysctl available */
-+ /* TODO: improve */
-+ topology.threads = topology.cores;
-+ topology.packages = 1;
-+ topology.threads_per_core = 1;
-+ return topology;
-+#endif
- fail:
- topology.packages = 0;
- return topology;
diff --git a/cpuinfo/patches/patch-src_init.c b/cpuinfo/patches/patch-src_init.c
deleted file mode 100644
index 85e472eba5..0000000000
--- a/cpuinfo/patches/patch-src_init.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Add basic NetBSD support.
-https://github.com/pytorch/cpuinfo/pull/315
-
---- src/init.c.orig 2025-07-24 17:36:24.000000000 +0000
-+++ src/init.c
-@@ -24,7 +24,7 @@ bool CPUINFO_ABI cpuinfo_initialize(void
- #if CPUINFO_ARCH_X86 || CPUINFO_ARCH_X86_64
- #if defined(__MACH__) && defined(__APPLE__)
- pthread_once(&init_guard, &cpuinfo_x86_mach_init);
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
- pthread_once(&init_guard, &cpuinfo_x86_freebsd_init);
- #elif defined(__linux__)
- pthread_once(&init_guard, &cpuinfo_x86_linux_init);
diff --git a/svt-av1/Makefile b/svt-av1/Makefile
index 4d618c7e71..7193301f84 100644
--- a/svt-av1/Makefile
+++ b/svt-av1/Makefile
@@ -25,5 +25,5 @@ CMAKE_CONFIGURE_ARGS+= -DCMAKE_BUILD_TYPE=Release
PKGCONFIG_OVERRIDE+= Source/Lib/pkg-config.pc.in
.include "../../devel/cmake/build.mk"
-.include "../../wip/cpuinfo/buildlink3.mk"
+.include "../../sysutils/cpuinfo/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Home |
Main Index |
Thread Index |
Old Index