From nobody Mon Jul 25 04:36:07 2022 X-Original-To: dev-commits-ports-branches@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 4LrnKz2jZhz4XLBT; Mon, 25 Jul 2022 04:36:07 +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 4LrnKz2CQvz3Ywg; Mon, 25 Jul 2022 04:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658723767; 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=axBu1dX/j4ZwxqBbPLWnHjK0gvvcYiNEJt3Lu+Bj6FI=; b=W4Ig2Jd3u9h12e6ITtavnrlOLVd93PvTPV0nsgNT79PEUY3wcMzIbceCuuEpiCyTPjqNN+ TtiRPk8pIiMSAmqbLcvQv6kUl3UU2fwjtgyAuZSP5ucgWnZDi64gOhWSc+H6cq9mArf2Xv AyDEPQPyFauGTRhiHSBn/ykv5bOFVDhErmczkVy+vS0giSnPZ2XlWmEuVeyY5x7IFrHOYs bHRPUsUrMDFtE/KHK9GTHhei6m82eo3Lxs4KXqJ9PXonis8V5HJIdhce7BeV2xvSett2Yo wCd2+t7xCELA32gEzai7dp3odHsSfiQXuCJk9Z6h5950bNwzIgopLnIN7RofwA== 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 4LrnKz1Fb2zl2p; Mon, 25 Jul 2022 04:36:07 +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 26P4a7aY064436; Mon, 25 Jul 2022 04:36:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26P4a7Pb064435; Mon, 25 Jul 2022 04:36:07 GMT (envelope-from git) Date: Mon, 25 Jul 2022 04:36:07 GMT Message-Id: <202207250436.26P4a7Pb064435@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 86cd004883ed - 2022Q3 - security/liboqs: Fix build on non-amd64 architectures List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 86cd004883ed46cad02c2a230a7a5013b73d09e4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658723767; 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=axBu1dX/j4ZwxqBbPLWnHjK0gvvcYiNEJt3Lu+Bj6FI=; b=wy4QOcvEW+A4L6Sn8w7wkd0rSAAxwVR/JmyE1ACkhQYRTBCp6kr/Jp3kS/W4ZiWsWymdWK s2SD/U0E/rfzBP35ZI7E8Sy76xiIzK4h/FQNUIIOBQMyJFbFkB6TQe4pbQ27DodozPCpPp D/AmCG0cjVm3GNQdiJZx5SK35WM34sfgo5Ib+/YLEXN5GAYuQ1qSWxQk3yqCohv5/+zLOR DaFaMwXwBYdyzkOZZnAg0wmNAO98Rd6kRPKWa37R5vOYBr3MYWrhM2qJoNfdNDon4leLKt v2pbwxfABZCwuCaVLt9h2KmLxdLGXNQ85mVO7kYHzfodK9dhkTGOtmbMQ328hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658723767; a=rsa-sha256; cv=none; b=PcC3NcY7hLKOo8Q2ALm2C0VaTSJ5viJreNTMLIvPCjWS6qKgmKd5zh3hPlORL2FE9kc1rN VOUUac8dVvRjNMR9KfkFwAWooJqmnaHb1LUmsG/1p4PrVofMKjsvjTrlDCV/qOwMahlW21 3hMiyJRfnUeyTwX/iXKCUeeofjpNG8+GkgQG4PqfYQEM7S0HQTkrNIrFa/PPxHZP8jRa5T NTz61MMUApIzsV9+O08G3NmwiKsg/QFXOGakTNT1Ve9Q4xN8hc2/ZaCLfAvjavuYdsTp3O 2FGHWuJjz0MQ/lzhmefPAqPeZZydH+HZo3YZtIxh4Wo+fQI0cCKcxZCcPevntQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=86cd004883ed46cad02c2a230a7a5013b73d09e4 commit 86cd004883ed46cad02c2a230a7a5013b73d09e4 Author: Yuri Victorovich AuthorDate: 2022-07-25 04:34:42 +0000 Commit: Yuri Victorovich CommitDate: 2022-07-25 04:36:02 +0000 security/liboqs: Fix build on non-amd64 architectures BIKE algorithm is limited by architecture and its files are only installed on amd64. (cherry picked from commit 2863100bb0091ace386be1c59582895565371b44) --- security/liboqs/Makefile | 8 ++++++++ security/liboqs/pkg-plist | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/security/liboqs/Makefile b/security/liboqs/Makefile index 3281d4ebfa70..eb6fcf05bb23 100644 --- a/security/liboqs/Makefile +++ b/security/liboqs/Makefile @@ -31,4 +31,12 @@ TEST_TARGET= run_tests BINARY_ALIAS= python3=${PYTHON_CMD} +.include + +.if ${ARCH} == amd64 +PLIST_SUB+= KEM_BIKE="" # BIKE algorithm is limited by architecture in .CMake/alg_support.cmake +.else +PLIST_SUB+= KEM_BIKE="@comment " +.endif + .include diff --git a/security/liboqs/pkg-plist b/security/liboqs/pkg-plist index 5b7dfb5ebd6d..c038e3589494 100644 --- a/security/liboqs/pkg-plist +++ b/security/liboqs/pkg-plist @@ -1,7 +1,7 @@ include/oqs/aes.h include/oqs/common.h include/oqs/kem.h -include/oqs/kem_bike.h +%%KEM_BIKE%%include/oqs/kem_bike.h include/oqs/kem_classic_mceliece.h include/oqs/kem_frodokem.h include/oqs/kem_hqc.h @@ -9,7 +9,7 @@ include/oqs/kem_kyber.h include/oqs/kem_ntru.h include/oqs/kem_ntruprime.h include/oqs/kem_saber.h -include/oqs/kem_sike.h +%%KEM_BIKE%%include/oqs/kem_sike.h include/oqs/oqs.h include/oqs/oqsconfig.h include/oqs/rand.h