From nobody Wed Dec 6 18:55:27 2023 X-Original-To: dev-commits-src-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 4SlmnD1Nk4z53pH8; Wed, 6 Dec 2023 18:55:28 +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 4SlmnD0YBpz3FsH; Wed, 6 Dec 2023 18:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701888928; 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=865fjcWSHe/l3oSVOLSigS7w7oN/FB9DYtZA7tVRfJE=; b=RG4DXaIqJrHaGd28PJ0l7ULfp2nKhOV47ixq+ptU3XHsCyOnZH6cgUHYP4o3gHAZdauWoB 2+8z3ZaZb435Co4F654SztlALrqmT4VLorSCaHNglt/Hz0hgKCFxhGotR7x0b1zq8AqIq2 c5Ex/HP4k645l0PB4aEet4VBPxpWsFQHfqAJacrIHFmEtzF384HMLn92htzW/Hh0khKCy/ 45S6Bi7n73YlbO83WlNdFxZlawAvEXgDzAmWwH5bHR14BU+9Z6xkw83pVy/YUz5yE00614 wBdibnmi0mOCOywpOrOYFDq7z4zt5pvP7ALURSL66K9uE7gV4rJfvWt5iUtR1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701888928; a=rsa-sha256; cv=none; b=SKzS/GVt9+DJXRMEUkDdh4dTnTglaa/FPBy8IL6p67BRnvaphEl+95uTUGOPBGumCJRMSc yCQM8Q+edUx3yFaUIMoLhAu4qwBMPeu4O4jfWf6NZc0RJgo8YgjFWSZ+3aMeWwviQiEORx juvCQjNuT4qoA/YCHBpQvI1D+TW5AcX7atZX/RvswpkKWNzVNKiEyV4IaUhCuabApda0cE g/Nc9dWYQjEMb7aN79mdWn0QcXUHNLVYx2gmYA8zXk5/zNtGssxw1wyfSUo7uZ0245/NXl uPL3z1IVukC2aLZnXFy3SOGDDspkQOU92krATcSkwi9wKVhu4hoZZ1bPnGwIlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701888928; 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=865fjcWSHe/l3oSVOLSigS7w7oN/FB9DYtZA7tVRfJE=; b=kiQoJEftSZSfcF/hqwPjk0pg/sWD63zuKOZDZ2jJOwru4BThmtsE8JS2Q094sLKLqBfzTs lMQXMdS4UJRB8W1aGinJzXBkq0omZ7CFmt+4Jf6k8YfFBw4JV/erljymzb0DghTFQ2AGC7 T+GoQAJtcEd6gzSHziyUGfRcRslkB+VG7NH15GKcBrGvSqvQsLRZFjEwxTR8d0298S4m9h R3dzy2PtEz+Yt907awGbA7HKAYy32wXGVY4gRBZ5pSTUjFRdINcxcNbdjnQRbc4P4uKPBK iVN9LxfZ2uKHKbpFuSHE7Hqzx358A3PopMsLODBA2RJsuSL0oq5/P8YhLu8SMQ== 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 4SlmnC6jbQz14QP; Wed, 6 Dec 2023 18:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6ItR41070184; Wed, 6 Dec 2023 18:55:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6ItRXx070181; Wed, 6 Dec 2023 18:55:27 GMT (envelope-from git) Date: Wed, 6 Dec 2023 18:55:27 GMT Message-Id: <202312061855.3B6ItRXx070181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d2ce3d89e93c - main - conf: Expand the include path for more openssl files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2ce3d89e93cab3942b771ccd64e7c83532c090a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d2ce3d89e93cab3942b771ccd64e7c83532c090a commit d2ce3d89e93cab3942b771ccd64e7c83532c090a Author: Mark Johnston AuthorDate: 2023-12-06 18:39:48 +0000 Commit: Mark Johnston CommitDate: 2023-12-06 18:41:34 +0000 conf: Expand the include path for more openssl files Fixes: e655cc70dfcd ("ossl: Move arm_arch.h to a common subdirectory") Reported by: Jenkins --- sys/conf/files.arm64 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 5d9464bade9c..e6f525e63e64 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -136,17 +136,17 @@ ghashv8-armx.o optional armv8crypto \ crypto/des/des_enc.c optional netsmb crypto/openssl/ossl_aarch64.c optional ossl crypto/openssl/aarch64/chacha-armv8.S optional ossl \ - compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" + compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} -I$S/crypto/openssl ${WERROR} ${.IMPSRC}" crypto/openssl/aarch64/poly1305-armv8.S optional ossl \ - compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" + compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} -I$S/crypto/openssl ${WERROR} ${.IMPSRC}" crypto/openssl/aarch64/sha1-armv8.S optional ossl \ - compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" + compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} -I$S/crypto/openssl ${WERROR} ${.IMPSRC}" crypto/openssl/aarch64/sha256-armv8.S optional ossl \ - compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" + compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} -I$S/crypto/openssl ${WERROR} ${.IMPSRC}" crypto/openssl/aarch64/sha512-armv8.S optional ossl \ - compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" + compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} -I$S/crypto/openssl ${WERROR} ${.IMPSRC}" crypto/openssl/aarch64/vpaes-armv8.S optional ossl \ - compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} ${WERROR} ${.IMPSRC}" + compile-with "${CC} -c ${CFLAGS:N-mgeneral-regs-only} -I$S/crypto/openssl ${WERROR} ${.IMPSRC}" dev/acpica/acpi_bus_if.m optional acpi dev/acpica/acpi_if.m optional acpi