From nobody Mon Mar 28 17:59:59 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 941F81A40239; Mon, 28 Mar 2022 17:59:59 +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 4KS0pR3jHjz4r4N; Mon, 28 Mar 2022 17:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648490399; 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=xxsdCEr9wyf4efxpEH6AxoZ48bzRQZkWAfuiwvalrD4=; b=bRSZ3tGt38IQ7UuC7pb9k1JeRhSQCrizWKQP+NVzinA0bkvmQ+irQLd9np0tMbprgpNgPl t5KLLASxwERh0Mhx2ciiBWEMkSzw+at/HxVAEpI4QDyfi5Z4H4V4QK0WE8KqtYeElPR2yo EelSY2N/N015x/utW8z4OPgKms4GqYGGjV/QWLefrz9kr7nY7iyodFP3xsSmjwUVhRgZ+V Qr4LjVAYbaf5WYa45pKlm1w/tTg44Q1DGu72wHyNmSvVUsMSNRVHewgrPn/jmu3M7Myzrn XBDMlClR6eQCLFbVH2J+YjQUEUD24wKxU22/7TWcY4YfUIVq5/+xDJ3odKdEaw== 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 603C864E7; Mon, 28 Mar 2022 17:59:59 +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 22SHxxTY091521; Mon, 28 Mar 2022 17:59:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SHxxEC091520; Mon, 28 Mar 2022 17:59:59 GMT (envelope-from git) Date: Mon, 28 Mar 2022 17:59:59 GMT Message-Id: <202203281759.22SHxxEC091520@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: f7b0e813f098 - main - devel/llvm14: Fix build on 13.0 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: f7b0e813f098ce7bafad184b77f614b5609d47a1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648490399; 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=xxsdCEr9wyf4efxpEH6AxoZ48bzRQZkWAfuiwvalrD4=; b=Tis5j8FJr8UTiS0wnD0/Wz2ZIMTvOSx+65GnE+fAku7I5QRjrKHnkR/PJBZNgh/PjIhUS7 XWUCEnctY4PybqrasQPpbXlJ+ecVkULWlMlVQ9w9ncCB9Ah7x8JVxlmESE6dGtQ0hAqM3M AvB9HXvTML3yeP77rBUHqXYmap8+4tfz3dkXsiXYjve7obGVjS1+TWri+9gY/x9P4Z+lRN L87HffkLljvbMLShUKuNrpUAFy73iquB8MajYTjhoEtd+PCtyGacVVkZJR9GezTZOWhAV8 vOd1mK1183aczH1N7ONEmZts6Ap8iJfh+998A7JYmHav2CUEt8gVCfD2fSAXow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648490399; a=rsa-sha256; cv=none; b=XJVBkVXuuCYavdYdOjwlAwhRjR/HtDTOxhMsCV0GvU91pmw060GlzQXeQnrk1EcZA65wy2 Q1h4JNTujlDLURUFNMmL7NRjbtSRXXFUWbKYJZ9hqNKhCZzolHwjHGQZDE0wvh7b82aXen zp5V24sJyVDfLU0FBwR/aSWp/I/y2UOeV0c9sMdGy4PPhNrb64cxwaR4fYplihHkGpwyjP +0cb2ziOK0jbNAJ3V2SLS3kHadQ9BpitXxKk3MbPJJoSmai3GBnUREySwsq/4aBQZdiaeZ BHx4T9sbbIZrrScWsltjnw1mP3+VsfmsR0PIauEFKUgRuQChzkimf/Qfk9VhrA== 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=f7b0e813f098ce7bafad184b77f614b5609d47a1 commit f7b0e813f098ce7bafad184b77f614b5609d47a1 Author: Brooks Davis AuthorDate: 2022-03-28 17:58:50 +0000 Commit: Brooks Davis CommitDate: 2022-03-28 17:58:50 +0000 devel/llvm14: Fix build on 13.0 The guards for using system unwind.h appear to be incorrect so revert that part of 04e074c6fd452983ccfd931de0c43263d27fe1f PR: 262707 --- devel/llvm14/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index 8e3bb67aa2b8..6079037d489a 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/Makefile @@ -134,6 +134,9 @@ CLANG_SUB_LIST= XCC=clang${LLVM_SUFFIX} \ X_COMPILER_TYPE=clang CLANG_USE= GNOME=libxml2 COMPILER_RT_DESC= Sanitizer libraries +# An unwind.h is require to build. I think an in-tree one should be used +# but this seems to work as a workaround... +COMPILER_RT_BUILD_DEPENDS= libunwind>0:devel/libunwind COMPILER_RT_CMAKE_ON= -DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE} # Allow unwind.h to be found reliably COMPILER_RT_USES= localbase @@ -270,12 +273,6 @@ MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP .include -.if ${OSVERSION} < 1300525 -# An unwind.h is require to build. I think an in-tree one should be used -# but this seems to work as a workaround... -COMPILER_RT_BUILD_DEPENDS= libunwind>0:devel/libunwind -.endif - .if defined(PPC_ABI) && ${PPC_ABI} == ELFv2 EXTRA_PATCHES= ${FILESDIR}/extra-patch-clang_lib_Driver_ToolChains_Clang.cpp .endif