From owner-svn-ports-all@freebsd.org Wed Aug 5 23:48:30 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 64EAD3AC7B9; Wed, 5 Aug 2020 23:48:30 +0000 (UTC) (envelope-from brooks@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BMSxV223dz4P4G; Wed, 5 Aug 2020 23:48:30 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 247981E1AF; Wed, 5 Aug 2020 23:48:30 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 075NmUFB040927; Wed, 5 Aug 2020 23:48:30 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 075NmTwr040925; Wed, 5 Aug 2020 23:48:29 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <202008052348.075NmTwr040925@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Wed, 5 Aug 2020 23:48:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544253 - in head/devel/llvm11: . files/clang X-SVN-Group: ports-head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: in head/devel/llvm11: . files/clang X-SVN-Commit-Revision: 544253 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Aug 2020 23:48:30 -0000 Author: brooks Date: Wed Aug 5 23:48:29 2020 New Revision: 544253 URL: https://svnweb.freebsd.org/changeset/ports/544253 Log: Fix build with more than one version of Python 3.x installed. [0] Fix C++ library selection with certain targets. [1] PR: 248386 [1], 248488 [0] Submitted by: Greg V [1], John Hein [0] Added: head/devel/llvm11/files/clang/patch-D77776 - copied unchanged from r543629, head/devel/llvm90/files/clang/patch-D77776 Modified: head/devel/llvm11/Makefile Modified: head/devel/llvm11/Makefile ============================================================================== --- head/devel/llvm11/Makefile Wed Aug 5 23:40:51 2020 (r544252) +++ head/devel/llvm11/Makefile Wed Aug 5 23:48:29 2020 (r544253) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 11.0.0rc1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR} @@ -55,9 +55,7 @@ CMAKE_ARGS+= -DLLVM_HOST_TRIPLE=${CONFIGURE_TARGET} CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH="share/man" CMAKE_ARGS+= -DLLVM_PARALLEL_LINK_JOBS=1 CMAKE_ARGS+= -DLLVM_ENABLE_Z3_SOLVER=OFF -CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHON_CMD} \ - -DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \ - -DPYTHON_LIBRARY=${LOCALBASE}/lib/lib${PYTHON_VERSION}${PYTHON_ABIVER}.so +CMAKE_ARGS+= -DPython3_EXECUTABLE=${PYTHON_CMD} # Disable assertions. They should be disabled by cmake, but USES=cmake # overrides -DCMAKE_*_FLAGS_RELEASE. Copied: head/devel/llvm11/files/clang/patch-D77776 (from r543629, head/devel/llvm90/files/clang/patch-D77776) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm11/files/clang/patch-D77776 Wed Aug 5 23:48:29 2020 (r544253, copy of r543629, head/devel/llvm90/files/clang/patch-D77776) @@ -0,0 +1,20 @@ +[Driver] Default to libc++ on FreeBSD + +Downstream may naively translate between DSL and LLVM target +triple. If OS version is lost in the process then Clang would +default to a version that's no longer supported by OS vendor. + +https://reviews.llvm.org/D77776 + +--- tools/clang/lib/Driver/ToolChains/FreeBSD.cpp.orig 2019-12-11 19:15:30 UTC ++++ tools/clang/lib/Driver/ToolChains/FreeBSD.cpp +@@ -351,7 +351,8 @@ FreeBSD::FreeBSD(const Driver &D, const llvm::Triple & + } + + ToolChain::CXXStdlibType FreeBSD::GetDefaultCXXStdlibType() const { +- if (getTriple().getOSMajorVersion() >= 10) ++ unsigned Major = getTriple().getOSMajorVersion(); ++ if (Major >= 10 || Major == 0) + return ToolChain::CST_Libcxx; + return ToolChain::CST_Libstdcxx; + }