Attachment 231053 Details for Bug 261252 – patch

[patch] patch

cpu_features.patch (text/plain), 3.10 KB, created by Yuri Victorovich on 2022-01-16 19:38:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2022-01-16 19:38:34 UTC

Size: 3.10 KB

patch

obsolete

>diff --git a/devel/cpu_features/Makefile b/devel/cpu_features/Makefile
>index 2c2ee5028668..bc15ae1cf9ca 100644
>--- a/devel/cpu_features/Makefile
>+++ b/devel/cpu_features/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	cpu_features
>-PORTVERSION=	0.6.0
>+DISTVERSION=	0.6.0
>+PORTREVISION=	1
> DISTVERSIONPREFIX=	v
> CATEGORIES=	devel
> 
>@@ -12,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> NOT_FOR_ARCHS=		aarch64 armv6 armv7 mips mips64 riscv64
> NOT_FOR_ARCHS_REASON=	assumes android if on ARM or MIPS; not ported to riscv64
> 
>-USES=	cmake:insource
>+USES=		cmake:testing
> USE_GITHUB=	yes
> GH_ACCOUNT=	google
> 
>@@ -20,11 +21,7 @@ CMAKE_ON=	BUILD_SHARED_LIBS
> 
> CFLAGS+=	-fPIC
> 
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/list_cpu_features ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_LIB} ${WRKSRC}/libcpu_features.so ${STAGEDIR}${PREFIX}/lib
>-	${MKDIR} ${STAGEDIR}${PREFIX}/include/internal
>-	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include
>-	${INSTALL_DATA} ${WRKSRC}/include/internal/*.h ${STAGEDIR}${PREFIX}/include/internal
>+post-install:
>+	${INSTALL_DATA} ${WRKSRC}/include/cpuinfo_*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME}
> 
> .include <bsd.port.mk>
>diff --git a/devel/cpu_features/pkg-plist b/devel/cpu_features/pkg-plist
>index e89c9e3391a6..c38fceecee8a 100644
>--- a/devel/cpu_features/pkg-plist
>+++ b/devel/cpu_features/pkg-plist
>@@ -1,15 +1,13 @@
> bin/list_cpu_features
>-include/cpu_features_cache_info.h
>-include/cpu_features_macros.h
>-include/cpuinfo_aarch64.h
>-include/cpuinfo_arm.h
>-include/cpuinfo_mips.h
>-include/cpuinfo_ppc.h
>-include/cpuinfo_x86.h
>-include/internal/bit_utils.h
>-include/internal/cpuid_x86.h
>-include/internal/filesystem.h
>-include/internal/hwcaps.h
>-include/internal/stack_line_reader.h
>-include/internal/string_view.h
>+include/cpu_features/cpu_features_cache_info.h
>+include/cpu_features/cpu_features_macros.h
>+include/cpu_features/cpuinfo_aarch64.h
>+include/cpu_features/cpuinfo_arm.h
>+include/cpu_features/cpuinfo_mips.h
>+include/cpu_features/cpuinfo_ppc.h
>+include/cpu_features/cpuinfo_x86.h
>+lib/cmake/CpuFeatures/CpuFeaturesConfig.cmake
>+lib/cmake/CpuFeatures/CpuFeaturesConfigVersion.cmake
>+lib/cmake/CpuFeatures/CpuFeaturesTargets-%%CMAKE_BUILD_TYPE%%.cmake
>+lib/cmake/CpuFeatures/CpuFeaturesTargets.cmake
> lib/libcpu_features.so
>diff --git a/devel/cpu_features/files/patch-cmake_googletest.CMakeLists.txt.in b/devel/cpu_features/files/patch-cmake_googletest.CMakeLists.txt.in
>new file mode 100644
>index 000000000000..574ffd9b7c5c
>--- /dev/null
>+++ b/devel/cpu_features/files/patch-cmake_googletest.CMakeLists.txt.in
>@@ -0,0 +1,17 @@
>+--- cmake/googletest.CMakeLists.txt.in.orig	2022-01-16 19:20:55 UTC
>++++ cmake/googletest.CMakeLists.txt.in
>+@@ -5,11 +5,11 @@ project(googletest-download NONE)
>+ include(ExternalProject)
>+ ExternalProject_Add(googletest
>+   GIT_REPOSITORY    https://github.com/google/googletest.git
>+-  GIT_TAG           master
>++  GIT_TAG           main
>+   SOURCE_DIR        "${CMAKE_BINARY_DIR}/googletest-src"
>+   BINARY_DIR        "${CMAKE_BINARY_DIR}/googletest-build"
>+   CONFIGURE_COMMAND ""
>+   BUILD_COMMAND     ""
>+   INSTALL_COMMAND   ""
>+   TEST_COMMAND      ""
>+-)
>+\ No newline at end of file
>++)

Actions: View | Diff

Attachments on bug 261252: 231045 | 231046 | 231048 | 231050 | 231053