git: 7e94a6e01792 - 2022Q4 - security/softether5: fix wrong CMAKE_BOOL_ON
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 10 Dec 2022 23:13:50 UTC
The branch 2022Q4 has been updated by meta:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7e94a6e01792de3f14b70b2855151fd84064192d
commit 7e94a6e01792de3f14b70b2855151fd84064192d
Author: Robert Clausecker <fuz@fuz.su>
AuthorDate: 2022-12-10 11:13:17 +0000
Commit: Koichiro Iwao <meta@FreeBSD.org>
CommitDate: 2022-12-10 23:12:36 +0000
security/softether5: fix wrong CMAKE_BOOL_ON
PR: 268294
No macro with this name is checked by USES=cmake. The correct
one would be CMAKE_ON, but that one is not evaluated again after
bsd.port.pre.mk. Just directly add -DSKIP_CPU_FEATURES=1 to
CMAKE_ARGS to work around this shortcoming.
(cherry picked from commit e1e189c2117ca7337a6133cb45523c249b6a7cd3)
---
security/softether5/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/softether5/Makefile b/security/softether5/Makefile
index a712008ceed2..c2c1b15875c4 100644
--- a/security/softether5/Makefile
+++ b/security/softether5/Makefile
@@ -57,7 +57,7 @@ SUB_FILES= pkg-message
# devel/cpu_features not available on these archs, see devel/cpu_features/Makefile
.if (${ARCH} == aarch64 || ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == mips || ${ARCH} == mips64)
# skip cpu_features when devel/cpu_features is not available
-CMAKE_BOOL_ON+= SKIP_CPU_FEATURES
+CMAKE_ARGS+= -DSKIP_CPU_FEATURES=1
.else
BUILD_DEPENDS+= ${LOCALBASE}/include/cpu_features/cpu_features_macros.h:devel/cpu_features
LIB_DEPENDS+= libcpu_features.so:devel/cpu_features