From nobody Thu Sep 29 22:48:47 2022 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 4MdpSH6fB0z4YMm2; Thu, 29 Sep 2022 22:48:47 +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 4MdpSH5smkz3TsQ; Thu, 29 Sep 2022 22:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664491727; 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=IA+8tK1rX+t7IX4taoFF475xkmpyRBFGwmgfjHJ2XnA=; b=NMsUCKz8L2/SyQBTvOfdFBXhupydfQO+Dza5X2Ryyh7qjI/nskbZPWFkUqVmZnV+vbVw0Y Met6LOZEeYPi7bOFv12iALUYgXfkWoNr2SfSUGri7ZGtWh9AngodkDn290JXluoNp86biW 3XEEuXPCLZtQbsQ8swWMMv5hhbn71rDKQXku/4w5KB8qbRtYDZw8M0a3tYVlxnxumug7Mu EXGOFHHKdfn0fEM1x8OjtTUggxO3AIR/2Bcg4JEX13XkwlHPO4J2OutP4g6BKv5hiB6KjS P58slt2r3VSF3U7mOnDOf2pBgN4wkUH4ZxHtvp+l/5r8oeVsD83HDHRMaj4bsQ== 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 4MdpSH4tTrzy9G; Thu, 29 Sep 2022 22:48:47 +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 28TMml9p052183; Thu, 29 Sep 2022 22:48:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28TMmlfU052182; Thu, 29 Sep 2022 22:48:47 GMT (envelope-from git) Date: Thu, 29 Sep 2022 22:48:47 GMT Message-Id: <202209292248.28TMmlfU052182@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: 38c131e44225 - main - devel/llvm-devel: use PLIST_FILES for GOLD (NFC) 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 38c131e442256c38b219a93018d0ff28f2c3bac7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664491727; 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=IA+8tK1rX+t7IX4taoFF475xkmpyRBFGwmgfjHJ2XnA=; b=D6ibRRI7uq3Uxs9NVGGSp/65TY85VRQCw5dC81qt7iyB7ZxBhGJVe6HQX19p7wjdJ7MHoT xzHI18hBIMv5/Mq2TyGKuGMIfUUHVIpPe0eh3domhknijKpWnHQAo/PXDrTl18rCjnUmF7 DX6esoq1KUp3N7Xpu6VlWIVj/bAJuJquJ5mQovjV8LqDuPnqMj2tVww+txCh9OlCid+wHw SdB6G11LetSt7YnjV8/DeVnnPGVoTlGVuli+33T+FuZ/AEfdVqwP1f6WNyv3f8fdWa/NSo rRqwO5J6sqkVN8uvAjpONBGde/lOFwj3Zho4DMG7EewV9nXJEMgY9usyNZnq5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664491727; a=rsa-sha256; cv=none; b=NJ7fP1svJ3vUsk1EPzZAXuyrsOhsFVoY+P8gfJWmrVrdwycPdh6446NM/v6nabY1XM4/ak H+UsmpE5lzLZ92RG4ae4hu4JtCg3HIR3QwD1XtKUgQL2nrzPqDP5uizLVzsF/LdQR1mmes bCFthpKcUbl8VTnQHjSZrYp0esRYIiv12psur1dIOizeWEgYEm1VM3/uXexUsKiGb9TzeM F/PKo1NiXRub6h4L+umbrpB+fjxj54MvbLCE/UVUEuXsayLIkpq4K7WgqAn8S8lH642IVM KNygg07zKCQ4Vx/AJE8YwiIVk3FEnWyHMvWU/BH4IqBM0vr7W3mlees9gZSz3g== 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=38c131e442256c38b219a93018d0ff28f2c3bac7 commit 38c131e442256c38b219a93018d0ff28f2c3bac7 Author: Brooks Davis AuthorDate: 2022-09-29 22:48:40 +0000 Commit: Brooks Davis CommitDate: 2022-09-29 22:48:40 +0000 devel/llvm-devel: use PLIST_FILES for GOLD (NFC) The GOLD option causes a single file to be built so move it to GOLD_PLIST_FILES and exclude it from the generated pkg-plist. This simplifies doing port maintenance on aarch64 systems were we don't currently build the gold plugin. --- devel/llvm-devel/Makefile | 4 ++-- devel/llvm-devel/pkg-plist | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 518482e532e9..44dfdb56e7fe 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -166,6 +166,7 @@ STATIC_LIBS_DESC= Install static libraries (does not effect sanitizers) GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils +GOLD_PLIST_FILES= ${LLVM_DIR}/lib/LLVMgold.so CONFLICTS_INSTALL= llvm-devel llvm-devel-lite @@ -501,8 +502,7 @@ build-plist: if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \ if ($$0 ~ /(${MLIR_PATTERN})/) {printf "%%%%MLIR%%%%"} \ if ($$0 ~ /(${OPENMP_PATTERN})/) {printf "%%%%OPENMP%%%%"} \ - if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \ - if ($$0 !~ /lib[a-z]*_rt/) {print} \ + if ($$0 !~ /(lib[a-z]*_rt|LLVMgold)/) {print} \ }' ${PLIST}.tmp >> ${PLIST} ${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST} ${ECHO_CMD} '@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST} diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist index 7655d7391a58..64445d660574 100644 --- a/devel/llvm-devel/pkg-plist +++ b/devel/llvm-devel/pkg-plist @@ -4966,7 +4966,6 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h %%MLIR%%llvm-devel/include/mlir/Transforms/Transforms.capi.cpp.inc %%MLIR%%llvm-devel/include/mlir/Transforms/Transforms.capi.h.inc %%MLIR%%llvm-devel/include/mlir/Transforms/ViewOpGraph.h -%%GOLD%%llvm-devel/lib/LLVMgold.so %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_builtin_vars.h %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_cmath.h %%CLANG%%llvm-devel/lib/clang/%%LLVM_RELEASE%%/include/__clang_cuda_complex_builtins.h