From nobody Fri Mar 29 18:11:50 2024 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 4V5pQK1lDKz5FNLV; Fri, 29 Mar 2024 18:11:53 +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 4V5pQJ3J4Dz4gyR; Fri, 29 Mar 2024 18:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711735912; 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=W5r8xD+aS0CWFDB7sU9m4u25EvkJO7jeOfFftd3iPhc=; b=bViwI+pX53NQpBkVFRovgQBEk8LBMgRR1BWIf0TH98+6eBMEPA8S5SeNKTJKk/3EeLT821 oOLEl7W4bBB6YbYmnkA/JpyQrfzykhNer5cj81/S2UeH8fQZFCiePPwNukNCDML+C49sEg TQDw3VTFKv/TpYgxfrpn2XPlI1DyrOZpQlweXbBbX1pnE4PBjbGmvMyoyWrvnWZz8DqitK 1wAfZyZdr5DbTsqW3hyVAE5x3UjndrXdYCBQJc2+JNktyQsD15qJ1D/PY2ynVqzAQKd97N lrW3Z+TEnsYkxqeb3130ETIvOwgoieHDpd0jUzuE7oKwE27QaO/CquyE/gFZog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711735912; a=rsa-sha256; cv=none; b=YOV8Cv8gEsNs7TLWG9U/+4OobT82EViVNYZHYK+roEB1VcnLZLMygrkK9t5VOzAFEHnMVX YdypU428UhQLPowAZZIqAHpFgBJ1Rg0IMjB0c78pebW6ifnGNCb8Msxcf7h17nvKjnT8hc tJV9II7k769xqlEU4bUOuBttrE7x6O7N1jn/jR/7eiPS8zwjY5mmO7AQNTwGhGzVdxflX8 mF5Hla3urh85PuuLl8RR1rmFs/63z1gP7auosoC+F6aENAWawshjyEshPTyjU8bL3fSv3s QgMCdYXoRCX/bkfX+NhB1gmXrpLhk0ir/qRtpSD3B3L7YmcRf7INKZA0FcLjfw== 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=1711735912; 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=W5r8xD+aS0CWFDB7sU9m4u25EvkJO7jeOfFftd3iPhc=; b=F51l6wcUV2AAnUAC8zAAe06uW1CRPTAZPBf55uMoGl0RiKSILabGBleQnK01cugDdZiGy0 u+mWOYxExWqtvrE3Vd/eXH5S2lcp6ePHKPAybQ2WjWeO9WVZgfR5ozqYakIxBnsuvIa7bY nzTntw8znw6xGqwpz71L75tZ5KD+88vjS+NOnhp1mqYdxfKfJqKdLygNjySdhxPv1KB+f2 tDEvO43Q12NjNUb6wZd3MrxdwpE4T5KvSOg1Ww11X4NC8z/+V3cOwCkU/z+XckZp4vEErw K056WJKmlIxgQAmek+jKyngdMoGwIUAida+HZahS+axNYQx4zwYLQxW+upa1bQ== 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 4V5pQG6jm2zM3F; Fri, 29 Mar 2024 18:11:50 +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 42TIBodQ078226; Fri, 29 Mar 2024 18:11:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42TIBoXa078223; Fri, 29 Mar 2024 18:11:50 GMT (envelope-from git) Date: Fri, 29 Mar 2024 18:11:50 GMT Message-Id: <202403291811.42TIBoXa078223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 43ae86aa8e24 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 43ae86aa8e24af1419b21bc1b1d76c113fdcc4d1 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=43ae86aa8e24af1419b21bc1b1d76c113fdcc4d1 commit 43ae86aa8e24af1419b21bc1b1d76c113fdcc4d1 Author: Mark Johnston AuthorDate: 2023-12-06 18:39:48 +0000 Commit: Mark Johnston CommitDate: 2024-03-29 13:53:05 +0000 conf: Expand the include path for more openssl files Fixes: e655cc70dfcd ("ossl: Move arm_arch.h to a common subdirectory") Reported by: Jenkins (cherry picked from commit d2ce3d89e93cab3942b771ccd64e7c83532c090a) --- 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 6c9f77c2eebd..15ae804bfb0f 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