From nobody Tue Dec 09 16:05:52 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 4dQkGm6pbrz6J6dl for ; Tue, 09 Dec 2025 16:05:52 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dQkGm1vXCz49yX for ; Tue, 09 Dec 2025 16:05:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765296352; 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=lhZotlI5vzjHfYMFxf+b3NPlUwpx4IB415yQdc3sJGc=; b=qyIo2lAErLaJNp1LRM2gYSHrKO85ERtwrmqdcgupAX8r1FgJ+FHDtXqtQzloQtiVCyC9Yy ED7o6hC6LH0rEAFD8TNNsDJP1baDa/2u+OhVtrCN6+cZOLpgs71Nfu1f7qtyxjI9L+F7Fh Dm7IPqcpKEQt4AkcAihtYJvpPF6Zv/PbKBMD/2p65TYaEbcU2OnPvv/NFMmABTfga1FeIX tg5DLAZ+ur+CElHhqZfC64UhlPgp6xPkN4Z6gTrsJSy8rGCab7XS1U7elgUAW4riZnqXhh zh893F54fJzEK+EjWxsRCOWyhyMv2fB6mu2Xv0rZhLmPakHjJzeM+6gV1LbUsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765296352; 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=lhZotlI5vzjHfYMFxf+b3NPlUwpx4IB415yQdc3sJGc=; b=l0/lvb5QDMZN94oACsEqjJ1anoEnSZCI7DtlteP8bxMNtati8vCCaFa6qA4+KOPA9Khhoy iixISb0KPcIJafjuO1XigexF+njYoHoIs/9KEC7n6s3QYlt2T5tFa4DNAMYIRyCE2QECpM UM0HhjKWsnQHSYAZCV8bHl5uiY20inGDC8Va+prLU7tJhPRKy4+ETPamDEXiuaI6znxxTY +thBYvXqLAbMergnY0IGNu7Mc9lPTYFDoP22HmRw6ZGn+xvDFisWcsQkgXrOZUNHZfpz46 jc4Nrkq3EjcQpktTb6KhRj9x3LRMQnMbsEJQ1snsB8t7+NTgfM+taT58UKVUDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765296352; a=rsa-sha256; cv=none; b=jm6E35zUfqjAn2UX54RNdYRoICS5ir/Nh8I3d6qhBiF5fAcU1Gz3jnjOTQRvwIFiRt/7yH 16i63YYSEuoKjnKrogzFUNsPbIhYjpZZxdQetaykXiUADywzyoj96MplECCKySg+K+pxZn hm6hGr7ffvVBBZNJ3TKU2mIKGp7ShBCEFrH3tPQx0sLNhayvhniqHkcs6JGH6vKC+N594d MB6eRrnLn9eiW8qv1ij10AoRIAwVD+mUZVR1uY/VjRU9kz6jMgr8KwYLv0Hpgem6UFpO5K p/aoFiTLrIBqq8CThwWrKTmuY04FHZDmWdYVNtaA2UDR6vVXbGbdI4vAYbbRwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dQkGm1B2kz15X4 for ; Tue, 09 Dec 2025 16:05:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 36404 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Dec 2025 16:05:52 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 4438cc0381fc - main - devel/llvm15: don't build gold plugin when disabled 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/main X-Git-Reftype: branch X-Git-Commit: 4438cc0381fc30d6e4867998539a02a1ad88d724 Auto-Submitted: auto-generated Date: Tue, 09 Dec 2025 16:05:52 +0000 Message-Id: <693848e0.36404.1a3a781b@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=4438cc0381fc30d6e4867998539a02a1ad88d724 commit 4438cc0381fc30d6e4867998539a02a1ad88d724 Author: Brooks Davis AuthorDate: 2025-12-09 16:04:26 +0000 Commit: Brooks Davis CommitDate: 2025-12-09 16:05:34 +0000 devel/llvm15: don't build gold plugin when disabled Disabling the GOLD option didn't actually disable building the plugin, it just didn't install it in the package. Actually stop traversing into the directory when the option disabled so we don't end up needing devel/binutils. PR: 291247 Sponsored by: DARPA, AFRL --- devel/llvm15/Makefile | 3 ++- devel/llvm15/files/gold-off-llvm_tools_CMakeLists.txt | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile index 2cc1cd7ce339..156426834d94 100644 --- a/devel/llvm15/Makefile +++ b/devel/llvm15/Makefile @@ -163,8 +163,9 @@ FLANG_IMPLIES= MLIR FLANG_PORTDOCS= flang FLANG_PLIST_DIRS= ${LLVM_DIR}/include/flang/Config 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_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include +GOLD_EXTRA_PATCHES_OFF= ${PATCHDIR}/gold-off-llvm_tools_CMakeLists.txt LIT_DESC= Install lit and FileCheck test tools LIT_VARS= _USES_PYTHON=python LLD_DESC= Install lld, the LLVM linker diff --git a/devel/llvm15/files/gold-off-llvm_tools_CMakeLists.txt b/devel/llvm15/files/gold-off-llvm_tools_CMakeLists.txt new file mode 100644 index 000000000000..59a4718e4143 --- /dev/null +++ b/devel/llvm15/files/gold-off-llvm_tools_CMakeLists.txt @@ -0,0 +1,10 @@ +--- llvm/tools/CMakeLists.txt.orig ++++ llvm/tools/CMakeLists.txt +@@ -29,7 +29,6 @@ + # requires targets specified in DEPENDS to exist before the call to + # ExternalProject_Add. + add_llvm_tool_subdirectory(lto) +-add_llvm_tool_subdirectory(gold) + add_llvm_tool_subdirectory(llvm-ar) + add_llvm_tool_subdirectory(llvm-config) + add_llvm_tool_subdirectory(llvm-lto)