pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

cpuinfo: switch to googletest from pkgsrc



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Aug 4 14:47:00 2025 +0200
Changeset:	dc337baa468e4dc21fd49232addf0db9aef048a0

Modified Files:
	cpuinfo/Makefile
	cpuinfo/PLIST
Removed Files:
	cpuinfo/TODO

Log Message:
cpuinfo: switch to googletest from pkgsrc

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dc337baa468e4dc21fd49232addf0db9aef048a0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cpuinfo/Makefile | 23 ++++++++++++++++------
 cpuinfo/PLIST    | 59 --------------------------------------------------------
 cpuinfo/TODO     |  1 -
 3 files changed, 17 insertions(+), 66 deletions(-)

diffs:
diff --git a/cpuinfo/Makefile b/cpuinfo/Makefile
index b0b9c677cf..4826f16766 100644
--- a/cpuinfo/Makefile
+++ b/cpuinfo/Makefile
@@ -6,11 +6,8 @@ MASTER_SITES=	${MASTER_SITE_GITHUB:=pytorch/}
 GITHUB_TAG=	33ed0be77d7767d0e2010e2c3cf972ef36c7c307
 DISTFILES=	${DEFAULT_DISTFILES}
 DISTFILES+=	benchmark-1.6.1.tar.gz
-DISTFILES+=	googletest-1.11.0.tar.gz
 SITES.benchmark-1.6.1.tar.gz= \
 	-${MASTER_SITE_GITHUB:=google/}benchmark/archive/v1.6.1.tar.gz
-SITES.googletest-1.11.0.tar.gz= \
-	-${MASTER_SITE_GITHUB:=google/}googletest/archive/release-1.11.0.tar.gz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/pytorch/cpuinfo/
@@ -23,14 +20,28 @@ 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
-CMAKE_CONFIGURE_ARGS+=	-DGOOGLETEST_SOURCE_DIR=deps/googletest
 
 post-extract:
 	${MV} ${WRKDIR}/benchmark-1.6.1 ${WRKSRC}/deps/googlebenchmark
-	${MV} ${WRKDIR}/googletest-release-1.11.0 ${WRKSRC}/deps/googletest
+
+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"
 #.include "../../benchmarks/google-benchmark/buildlink3.mk"
-#.include "../../devel/googletest/buildlink3.mk"
+.include "../../devel/googletest/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cpuinfo/PLIST b/cpuinfo/PLIST
index a816e2bafa..9744015d4e 100644
--- a/cpuinfo/PLIST
+++ b/cpuinfo/PLIST
@@ -3,67 +3,8 @@ bin/cache-info
 bin/cpu-info
 bin/cpuid-dump
 bin/isa-info
-include/benchmark/benchmark.h
 include/cpuinfo.h
-include/gmock/gmock-actions.h
-include/gmock/gmock-cardinalities.h
-include/gmock/gmock-function-mocker.h
-include/gmock/gmock-matchers.h
-include/gmock/gmock-more-actions.h
-include/gmock/gmock-more-matchers.h
-include/gmock/gmock-nice-strict.h
-include/gmock/gmock-spec-builders.h
-include/gmock/gmock.h
-include/gmock/internal/custom/README.md
-include/gmock/internal/custom/gmock-generated-actions.h
-include/gmock/internal/custom/gmock-matchers.h
-include/gmock/internal/custom/gmock-port.h
-include/gmock/internal/gmock-internal-utils.h
-include/gmock/internal/gmock-port.h
-include/gmock/internal/gmock-pp.h
-include/gtest/gtest-death-test.h
-include/gtest/gtest-matchers.h
-include/gtest/gtest-message.h
-include/gtest/gtest-param-test.h
-include/gtest/gtest-printers.h
-include/gtest/gtest-spi.h
-include/gtest/gtest-test-part.h
-include/gtest/gtest-typed-test.h
-include/gtest/gtest.h
-include/gtest/gtest_pred_impl.h
-include/gtest/gtest_prod.h
-include/gtest/internal/custom/README.md
-include/gtest/internal/custom/gtest-port.h
-include/gtest/internal/custom/gtest-printers.h
-include/gtest/internal/custom/gtest.h
-include/gtest/internal/gtest-death-test-internal.h
-include/gtest/internal/gtest-filepath.h
-include/gtest/internal/gtest-internal.h
-include/gtest/internal/gtest-param-util.h
-include/gtest/internal/gtest-port-arch.h
-include/gtest/internal/gtest-port.h
-include/gtest/internal/gtest-string.h
-include/gtest/internal/gtest-type-util.h
-lib/cmake/GTest/GTestConfig.cmake
-lib/cmake/GTest/GTestConfigVersion.cmake
-lib/cmake/GTest/GTestTargets-noconfig.cmake
-lib/cmake/GTest/GTestTargets.cmake
-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/libcpuinfo.a
-lib/libgmock.a
-lib/libgmock_main.a
-lib/libgtest.a
-lib/libgtest_main.a
-lib/pkgconfig/benchmark.pc
-lib/pkgconfig/gmock.pc
-lib/pkgconfig/gmock_main.pc
-lib/pkgconfig/gtest.pc
-lib/pkgconfig/gtest_main.pc
 lib/pkgconfig/libcpuinfo.pc
 share/cpuinfo/cpuinfo-config.cmake
 share/cpuinfo/cpuinfo-targets-noconfig.cmake
diff --git a/cpuinfo/TODO b/cpuinfo/TODO
deleted file mode 100644
index c83884913f..0000000000
--- a/cpuinfo/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Installs googletest and benchmark files.


Home | Main Index | Thread Index | Old Index