From nobody Tue May 3 18:58:45 2022 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 0D71B1AC146C; Tue, 3 May 2022 18:58:46 +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 4Kt8Pd4sXyz3rLp; Tue, 3 May 2022 18:58:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651604325; 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=9M1YKksvDuFIuySoSW5tNQkMWWG78w0b7d4/Eq/fpj8=; b=su7nSdB+qNKkMFuBLmQxIcmEfcJL+y8iRmDsHpAAGxkqqsRX4QwMqhC2GvWwOARem/DNrz 6BgWnb50tQghLCwLnHHi0SlXeaLEnh+hnoKwdt32HT7138p/E8h40vAFRqa+o+9n2Gi4lv E5HF9c/y1PKdhQGJwVX8+Tw8Fb2V9CRauEf2T3/tQTpsRiO3JoD7BQmsMUFjn7EeFw6ofl zNd15lpRZabeaBj/zBg5HQ3Ae8IO5qOa1kRbln88Si5f28lQWJg5ZrGKBtchNOJY+yt8Jw X0xS0UeimJvYjFgS/WcIOFrS2eh4n28fRqeodZIfJ5V54enNncCF+QlaKo+riA== 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 5A68623BA7; Tue, 3 May 2022 18:58:45 +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 243Iwjot071344; Tue, 3 May 2022 18:58:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 243IwjKp071343; Tue, 3 May 2022 18:58:45 GMT (envelope-from git) Date: Tue, 3 May 2022 18:58:45 GMT Message-Id: <202205031858.243IwjKp071343@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: f141ed66e36a - main - devel/llvm-{cheri,morello}: Fix plist without LLD 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: f141ed66e36aeff760541a5867b7af61d005c8d3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651604325; 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=9M1YKksvDuFIuySoSW5tNQkMWWG78w0b7d4/Eq/fpj8=; b=snccRzgczIVShEmXjoOk+dsyTEKOqMitrTkoeQ3ixW2hJU5UKmtcqeIZhTOWIWAvo8JGjg VAzgn+59ii4oXGajC+l8jgoiwQVZ+PqIEzPtD26K2pc/31TMpkzw9FRTohhEsO2Xberc5O /SPpypXjuco/jF0/krOwbsMGtRLrDAgD+HzXGuukyRnA5YiCetvDcArkD4eVtMLSpwBaBP +ebvNh6lRTLCTJJIMP3ZooAids8K6K7zx2AZVkVlE0CyAYErCq/6aAH+yH7HNTJo7iJbgz 3o7f7qH/DEJvpJbbLbjSmKi6O/QkRXkyc+ZCFsIo1UA9iR2qmN9JDYe7sbuNTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651604325; a=rsa-sha256; cv=none; b=vr5CaNWeiL/7mH691XVg9hBfBQ6vp4GMR4QFpS8DB10lWU9EcYUGUA+gfWMRAQPyF7tw1j 1VdREaG0FYtYS4xK+6rRgwQLXgI688fOmd9H0WBPhNunZ1lCOhzohWDG3rgOKcr0FFP2cu Z2WfnDoIBvXjz0pICB5See2yck5p9qLYatuNVYr8CJJRX7YLUUbA83VlxlnKex/B784M7z CINGKQeS4PzmjmF9xUILL4C8/scb+2tDxa4DU4eeBu7FDm8QB/utk1Ze198JMu4O4Pp2Pl 0jatyq0Hv8ZFz5J47BMgHGuztGUcvHfQFW6P2AKH1TtBB6lIjyki4OMDG3c72A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=f141ed66e36aeff760541a5867b7af61d005c8d3 commit f141ed66e36aeff760541a5867b7af61d005c8d3 Author: Brooks Davis AuthorDate: 2022-05-03 18:58:34 +0000 Commit: Brooks Davis CommitDate: 2022-05-03 18:58:34 +0000 devel/llvm-{cheri,morello}: Fix plist without LLD The ld -> ld.lld symlink is enabled by the LLD option. Sponsored by: DARPA, AFRL --- devel/llvm-cheri/Makefile | 2 +- devel/llvm-cheri/pkg-plist | 2 +- devel/llvm-morello/pkg-plist | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devel/llvm-cheri/Makefile b/devel/llvm-cheri/Makefile index 40e48b07deb6..596fe3afdaba 100644 --- a/devel/llvm-cheri/Makefile +++ b/devel/llvm-cheri/Makefile @@ -256,7 +256,7 @@ build-plist: | ${SORT} >> ${PLIST}.tmp awk '{ \ if ($$0 ~ /clang/ && $$0 !~ /omp.h/) {printf "%%%%CLANG%%%%"} \ - if ($$0 ~ /lld|wasm-ld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \ + if ($$0 ~ /(bin\/(ld|lld|wasm-ld))|liblld[^b]|\/lld\// && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \ if ($$0 ~ /(argdumper|lldb)/) {printf "%%%%LLDB%%%%"} \ print \ }' \${PLIST}.tmp >> ${PLIST} diff --git a/devel/llvm-cheri/pkg-plist b/devel/llvm-cheri/pkg-plist index 78d335a792f8..8f12b403f588 100644 --- a/devel/llvm-cheri/pkg-plist +++ b/devel/llvm-cheri/pkg-plist @@ -113,7 +113,7 @@ llvm%%LLVM_SUFFIX%%/bin/dsymutil %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/git-clang-format llvm%%LLVM_SUFFIX%%/bin/hmaptool llvm%%LLVM_SUFFIX%%/bin/intercept-build -llvm%%LLVM_SUFFIX%%/bin/ld +%%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld.lld %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld.darwinnew diff --git a/devel/llvm-morello/pkg-plist b/devel/llvm-morello/pkg-plist index ff1a3bdef8dc..d7034ef12f8f 100644 --- a/devel/llvm-morello/pkg-plist +++ b/devel/llvm-morello/pkg-plist @@ -113,7 +113,7 @@ llvm%%LLVM_SUFFIX%%/bin/dsymutil %%CLANG%%llvm%%LLVM_SUFFIX%%/bin/git-clang-format llvm%%LLVM_SUFFIX%%/bin/hmaptool llvm%%LLVM_SUFFIX%%/bin/intercept-build -llvm%%LLVM_SUFFIX%%/bin/ld +%%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld.lld %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld %%LLD%%llvm%%LLVM_SUFFIX%%/bin/ld64.lld.darwinnew