svn commit: r507836 - in head/devel/llvm80: . files

[Craig Leres]

On 2019-08-01 14:27, Brooks Davis wrote:
> Author: brooks
> Date: Thu Aug  1 23:27:30 2019
> New Revision: 507836
> URL: https://svnweb.freebsd.org/changeset/ports/507836

>     - Pin the python version to 3.6 rather than 2.7.
> -_USES_PYTHON?=	python:2.7,build
> +_USES_PYTHON?=	python:3.6,build

This breaks things when the default python3 is not 3.6, e.g:

     DEFAULT_VERSIONS+= python3=3.7
     DEFAULT_VERSIONS+= python=3.7

In my case my build servers saw 17 ports ignored due to:

     Unknown flavor 'py36', possible flavors: py37 py27

and > 100 skipped mostly due to:

     py36-pygments-2.4.1

missing. I think changing to python:3.6+ fixes this but it'll be a few 
hours before my test build completes. Attached is what I am trying (but 
so far so good).

(A lot of other ports seem to use python:3.5+ but I didn't want to take 
the time to test that.)

		Craig
-------------- next part --------------
Index: devel/llvm80/Makefile
===================================================================
--- devel/llvm80/Makefile	(revision 507866)
+++ devel/llvm80/Makefile	(working copy)
@@ -24,7 +24,7 @@
 
 USES=		cmake compiler:c++11-lib libedit perl5 tar:xz \
 		shebangfix
-_USES_PYTHON?=	python:3.6,build
+_USES_PYTHON?=	python:3.6+,build
 USES+=		${_USES_PYTHON}
 USE_LDCONFIG=	${LLVM_PREFIX}/lib
 SHEBANG_FILES=	utils/lit/lit.py utils/llvm-lit/llvm-lit.in \
@@ -100,7 +100,7 @@
 GOLD_CMAKE_ON=		-DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include
 GOLD_BUILD_DEPENDS=	${LOCALBASE}/bin/ld.gold:devel/binutils
 LIT_DESC=		Install lit and FileCheck test tools
-LIT_VARS=		_USES_PYTHON=python:3.6
+LIT_VARS=		_USES_PYTHON=python:3.6+
 LLD_DESC=		Install lld, the LLVM linker
 LLD_DISTFILES=		lld-${DISTVERSION}.src${EXTRACT_SUFX}
 LLD_EXTRA_PATCHES=	${PATCHDIR}/lld
@@ -110,7 +110,7 @@
 LLDB_DISTFILES=		lldb-${DISTVERSION}.src${EXTRACT_SUFX}
 LLDB_EXTRA_PATCHES=	${PATCHDIR}/lldb
 LLDB_IMPLIES=		CLANG
-LLDB_VARS=		_USES_PYTHON=python:3.6
+LLDB_VARS=		_USES_PYTHON=python:3.6+
 OPENMP_DESC=		Install libomp, the LLVM OpenMP runtime library
 OPENMP_DISTFILES=	openmp-${DISTVERSION}.src${EXTRACT_SUFX}
 OPENMP_EXTRA_PATCHES=	${PATCHDIR}/openmp