From nobody Wed Jan 8 20:04:09 2025 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 4YSzQL1qLNz5jrQF; Wed, 08 Jan 2025 20:04:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YSzQL0lfJz4Pr1; Wed, 8 Jan 2025 20:04:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736366650; 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=xcyfLuhs6a98grZzcRZX8i1hIhCoZKkw2i4tps630Kw=; b=sjJ/m05sYFucxpOJU/Eb/O8ZQNns8N/PhZlfB+2/QVTHHULL0kzwRaC6wSqlmS3yID92Jm D72NTak+uEzSYisCqh18ZqUc9HXw84ovaEDBIFexczzhwZjXKAnMMdFqbMQaLqzInv8LYu 9EQCVnMhnepqWOUzpe6cL7iJEatnPyr59NiN3XbiCJL056u0/LfPjhsS0t+XlZnvaebxai 05Q+K3tSfGbirhfOaDgXZgonS9mdcEtC62REKejTeOs/a4pF7VYbVGDLh/GmkkvMwH/ZRr Kfl/s+PTqE9ex/yykeYdLRhECAMONyo0Ng09cSWjz9pU5A/MkSnvY4eQidCgxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736366650; 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=xcyfLuhs6a98grZzcRZX8i1hIhCoZKkw2i4tps630Kw=; b=P39INM9pxQx7fu6yp5ww3w/MvYE7wfnURW+3ebxB8UwnI3t/XR1rMOWO1fEf5nfUzCMiT0 44tDeHH3wYQU/NgfFZckC2pCL6Sks2EzaCOKwFoqA+OakjAp7vY0P2bc2Htn0UY2WnTsqd x4iO8lQ4qAiFJo4IuTDXh276F16YamFY50Y5xIMRb5dfEjnnPxR6jzdL9cn7VsL5lePoTS 8Xt2R2yW6kS62pNa8WSaffA2fss3wLAUxnEGkpm6kv2Oh/sux4jDUtbacFeybCbMT1+R/P /hijn0LURen4Z32tTFHRcNtEYXag+EZIgCg7qWsL5op7ZtkY8MMN/n6ZwlUH2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736366650; a=rsa-sha256; cv=none; b=BqqnwnXfaE5uOZio5DJ9upPwC5zhRvXLy202Y9cVqg0wekDNBBF7c6GosKjodP4EgpBY4G 8/0+fml0KcvSx32SH2Nr3+bjVpE3ZJ65p7Ulmk/SsTQ4p3nU8LkqgShn0sC3+jtZ52424A NLlhAhahpEmkwAQlpnVRQBXNa7YAiz6lDuCKRYLxme6UPpz6eUcHVQUPOTDbUlZgfSxe+B OVFhcwnU42Rfb74HWForzhBdNT4y2N39b9PPL9kug3mmu33QGf6+qaIZG4jnVGybSrNmIi aFQ2kz+mSb2hPblOnRqlaY55GpKu6Y6OmNz0+WOatFgTsyy09VnZ6L4oVYxMrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YSzQL0Kwcz19B5; Wed, 08 Jan 2025 20:04:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 508K49IQ030638; Wed, 8 Jan 2025 20:04:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 508K49Mg030635; Wed, 8 Jan 2025 20:04:09 GMT (envelope-from git) Date: Wed, 8 Jan 2025 20:04:09 GMT Message-Id: <202501082004.508K49Mg030635@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Brooks Davis Subject: git: cc5192d32c8a - 2025Q1 - devel/llvm-cheri: Actually add files/llvm## to patches 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: cc5192d32c8ab964c5d3e318b8b1aa8a5c22d2b1 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc5192d32c8ab964c5d3e318b8b1aa8a5c22d2b1 commit cc5192d32c8ab964c5d3e318b8b1aa8a5c22d2b1 Author: Brooks Davis AuthorDate: 2025-01-06 16:35:35 +0000 Commit: Brooks Davis CommitDate: 2025-01-08 20:03:45 +0000 devel/llvm-cheri: Actually add files/llvm## to patches Move conditional EXTRA_PATCHES additions after bsd.port.pre.mk so PATCHDIR is defined. Sponsored by: DARPA, AFRL (cherry picked from commit dab073e2c95b0f20992b57f1a8ac41bf6d0e9825) --- devel/llvm-cheri/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index 282f5c1bcfad..efed661a6eec 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -111,13 +111,6 @@ STRIP_LIBS= BugpointPasses.so \ ${LIBNAME}.0 \ libLTO.so -.if exists(${PATCHDIR}/llvm${LLVM_MAJOR}) -EXTRA_PATCHES+= ${PATCHDIR}/llvm${LLVM_MAJOR} -.endif -.if ${.PARSEDIR} != ${.CURDIR} && exists(${.CURDIR}/files) -EXTRA_PATCHES+= ${.CURDIR}/files -.endif - .include # keep in sync with /usr/src/lib/clang/clang.build.mk @@ -156,6 +149,14 @@ _USES_PYTHON?= python:build USES+= ${_USES_PYTHON} .include + +.if exists(${PATCHDIR}/llvm${LLVM_MAJOR}) +EXTRA_PATCHES+= ${PATCHDIR}/llvm${LLVM_MAJOR} +.endif +.if ${.PARSEDIR} != ${.CURDIR} && exists(${.CURDIR}/files) +EXTRA_PATCHES+= ${.CURDIR}/files +.endif + .include "${.CURDIR}/Makefile.COMMANDS" .sinclude "${.CURDIR}/Makefile.MAN1SRCS"