From nobody Sat Dec 10 23:13:50 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NV3by5Lhtz4kkcM; Sat, 10 Dec 2022 23:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NV3by4rKzz47Rr; Sat, 10 Dec 2022 23:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670714030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9XQ1Sm1RQTcGf9xGYN5HoIhMkGXtWnpYcRrg1xqkzw=; b=iRNmTd8HfUUtVmr6e4atdC0dEpzD5Zrp/N0cuVZ28ffLdoc49tu2yZsXO8I7JtHQ3LGa1c NK8CGeGpuJAiPuVZMhH+6Albx3ZPUYYfri9U285kUzPikT75On/s9p2GFr5RS/vyhYKIEg 0OY75mYAvWCnHcWVpfh2TrXa7qpR6O97OsDgQg1sTkdZsT9wtSBVTiPcn8yI4gkRY1OQEO dp5SWVHjWQpBh6otZZUckNvKzeoOfEWI2XJKUc6JjZLbHMc3JIj4eNaAFUaAl7IbIzvG9X arFaBMimkDmaLUbuGOi/wEuZ4qoAnhzaBs0xtzYOCNMjUMuhGk0OaQDQn1ZOxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670714030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9XQ1Sm1RQTcGf9xGYN5HoIhMkGXtWnpYcRrg1xqkzw=; b=GnuHLVEK9ZsPqjbexqQanRN2cNCeuKuM/Fa8TW/K2B3tTEBVdo6zynpCFFFf4QdCcGWLQt lkBK9/HUcNKf5X/C2E19mGFmMY/oN+Ih7Zi/sD+YhfYb8M0LTBE/ZpG+2+pL9KVgqb1Cbv JN2O/Nfo3u6tp+GqPVt6REMJhTN0tZmHvcpTgWHX3CQfLOd1MuPWBYaS5Sl48NSS/q6qnX QDu47ZZwpAdM+dQFmjwF5cP/5mOQo+G8Ri2dJCibQmxVQ5YgBWvFSAeVih60Yj8oHzsny1 iWKUqyOpRndtzAhBQMGdGU0npDkWAg50Q2RpKx+aUE4FE3/8/7P8bP3PhLl9ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670714030; a=rsa-sha256; cv=none; b=T8MjSH9aDeGeLb4CELiduDeLgSceebcRFCiTmC6xGS1qVAv/egpYMtkjtbYF5L3dSPWNan SJCTX75QYPMXQDH930nzhXwug0O+lr4pRunWSTt5lXJG4kLoQYzQokrzhaIEqr6dpV56SP TggTc5GZ5xM/YzkqNR9HsWK/+UJofXr2TC1Q2DsuL7GlNShB+qF2ccI5qTIBnlEy5Dadsl Fva035Pia/bKnTElOprehpbn2fzTB5HQ+a3TZYGm7errJI/biVoNVI+slkgigkvwLRuxoh H9kGLKSSSqCuCokU25jrI6HNTwfEq/MF+xqQ33+QCt4kQws/sHHvLULOG74Scg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NV3by3ppmzYcd; Sat, 10 Dec 2022 23:13:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BANDoTh089899; Sat, 10 Dec 2022 23:13:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BANDo71089898; Sat, 10 Dec 2022 23:13:50 GMT (envelope-from git) Date: Sat, 10 Dec 2022 23:13:50 GMT Message-Id: <202212102313.2BANDo71089898@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Koichiro Iwao Subject: git: 7e94a6e01792 - 2022Q4 - security/softether5: fix wrong CMAKE_BOOL_ON List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: meta X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: 7e94a6e01792de3f14b70b2855151fd84064192d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=7e94a6e01792de3f14b70b2855151fd84064192d commit 7e94a6e01792de3f14b70b2855151fd84064192d Author: Robert Clausecker AuthorDate: 2022-12-10 11:13:17 +0000 Commit: Koichiro Iwao 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