From nobody Mon Jan 6 16:38:55 2025 X-Original-To: dev-commits-ports-main@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 4YRfyR4c50z5jqC7; Mon, 06 Jan 2025 16:38:55 +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 4YRfyR3wK9z43J0; Mon, 6 Jan 2025 16:38:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736181535; 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=WryGZG2ZFqq7GZ90jOiU5BjHZyU3oUEmUVM9GcyLljM=; b=K/PK47CM5X3sax7XdjhTlx0W2vdM837N5HTQo9hwdwjj1jdfRlssbYUyeRINl5fWRvDtHV HffYwfWIFrChKFJdqcx+df6u/hvDgzp2RbPpPT8zykgw5jH+4Vk3uJIvCtf9izupE5z3lI +LnoCL3+xN7b9uS1gQylFFGI57K+us4lcYWsdOE5U/y9uKvY7X7+K75mO/WIJyf9+dsduE IuJrUaOfx/IF0opo2fjtYtQQyAbmuxdPqPODf/JhVjVrCaj2Hmy7sAQuSMTCdxsH73sNm3 GvR56geBUIR9qq+Wh7Eq2gbRCB1ECwX2TAsesPBbFo+81lwRuvQfDNyoH6vhVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736181535; 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=WryGZG2ZFqq7GZ90jOiU5BjHZyU3oUEmUVM9GcyLljM=; b=F4/kMriFy8q0R37plhfxEo/sP14lpsEVZBsNt4o0vPEohe6N9FH5m8XE21wEZE/1IbCWvl 6rfl/uJuOrTmjreefXiiEe+p/aleWC/UXbHIVv2DQLfZbmob0L+JI5HVr08DdTt4z4h98S WTqTNghiDouxFasZK5i6Mvd8hKZM9neYTmFr5hgkFS1gUYpyLoRumEdS5vTI0Zm5TevtTx p1KEtC6sbDd1Ya0Ef5G239pCvo3GfomtA6plRqUoX8LPGrQreOVBLX6TQOuwK4Pn+mhc/C WEgxUcnyjgSYGZVOJmbSNq4btuv2NO1eM5UmLameCRjuvoFg70olAnlvPi9icQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736181535; a=rsa-sha256; cv=none; b=C27lNukjnNQQxKcY+gJoECYqIYrGE6qvyfMaxz13Hz45YpwurHgmFyIIobE9jFU6kYAQuv QdeyIuauz144ItuPcudzKLm++CEreiDEGsaX8lrBhOybtETQ1eYv9udMpRgTLNsdl1OpD8 8TSmMwBqbWESrOsZLd0nIhKz5Vd3r834gMXOnq77FFrjkQLiscwddhWiirop8Bf+duTNxj dBpYwgIE+fO7qyabhhjnTzQjekiKRLM8pRw/mg3reWpTBUTkX6O6/jGkn9YsUhrsJdXVlf uIlpjHhoFKL+KNbdIHR9oyDA5GAG5kzSv0H0KpyLgD92Jx7rFpkhneL0ZevDxQ== 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 4YRfyR3X8fzXp4; Mon, 06 Jan 2025 16:38:55 +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 506Gct1J040087; Mon, 6 Jan 2025 16:38:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 506Gcto2040084; Mon, 6 Jan 2025 16:38:55 GMT (envelope-from git) Date: Mon, 6 Jan 2025 16:38:55 GMT Message-Id: <202501061638.506Gcto2040084@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: dab073e2c95b - main - devel/llvm-cheri: Actually add files/llvm## to patches List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: dab073e2c95b0f20992b57f1a8ac41bf6d0e9825 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=dab073e2c95b0f20992b57f1a8ac41bf6d0e9825 commit dab073e2c95b0f20992b57f1a8ac41bf6d0e9825 Author: Brooks Davis AuthorDate: 2025-01-06 16:35:35 +0000 Commit: Brooks Davis CommitDate: 2025-01-06 16:38:15 +0000 devel/llvm-cheri: Actually add files/llvm## to patches Move condiationl EXTRA_PATCHES additions after bsd.port.pre.mk so PATCHDIR is defined. Sponsored by: DARPA, AFRL --- 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"