diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-05-11 20:11:41 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2020-05-11 20:11:41 +0000 |
| commit | cf473c33af18067cb11f0fc0d5c09e9aeca82b78 (patch) | |
| tree | aa836e97d7e9cc686a9d496b83bfe2d5d72ad694 | |
| parent | c031fd115a267199aa9cd9ee7d4a790ac6d27c03 (diff) | |
| download | ports-cf473c33af18067cb11f0fc0d5c09e9aeca82b78.tar.gz ports-cf473c33af18067cb11f0fc0d5c09e9aeca82b78.zip | |
Adapt LLVM_DEFAULT downgrades to the new version scheme in devel/llvm10
$ DEFAULT_VERSIONS=llvm=90 make -V LLVM_DEFAULT -C graphics/mesa-dri
80
$ DEFAULT_VERSIONS=llvm=10 make -V LLVM_DEFAULT -C graphics/mesa-dri
10
PR: 245178
Reported by: mi
Approved by: x11 (zeising), maintainer timeout (2 months)
MFH: 2020Q2 (for llvm10 users)
Differential Revision: https://reviews.freebsd.org/D24222
Notes
Notes:
svn path=/head/; revision=534936
| -rw-r--r-- | devel/libclc/Makefile | 2 | ||||
| -rw-r--r-- | devel/oclgrind/Makefile | 2 | ||||
| -rw-r--r-- | devel/py-llvmlite/Makefile | 4 | ||||
| -rw-r--r-- | devel/qtcreator/Makefile | 2 | ||||
| -rw-r--r-- | graphics/mesa-dri/Makefile.common | 2 | ||||
| -rw-r--r-- | security/afl/Makefile | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/devel/libclc/Makefile b/devel/libclc/Makefile index 8fc8cbf6349c..e5568cff4974 100644 --- a/devel/libclc/Makefile +++ b/devel/libclc/Makefile @@ -44,7 +44,7 @@ do-configure: .include <bsd.port.options.mk> # Keep in sync with lang/clover -.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 LLVM_DEFAULT= 80 .endif diff --git a/devel/oclgrind/Makefile b/devel/oclgrind/Makefile index aca6e262cfb5..890fa0664986 100644 --- a/devel/oclgrind/Makefile +++ b/devel/oclgrind/Makefile @@ -33,7 +33,7 @@ CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm .include <bsd.port.options.mk> -.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 LLVM_DEFAULT= 80 .endif diff --git a/devel/py-llvmlite/Makefile b/devel/py-llvmlite/Makefile index b10746b6dc34..343fbadb62e8 100644 --- a/devel/py-llvmlite/Makefile +++ b/devel/py-llvmlite/Makefile @@ -30,9 +30,9 @@ LLVM_SUPPORTED_MAX= 80 .include <bsd.port.pre.mk> -.if ${LLVM_DEFAULT:S,-devel,990,} < ${LLVM_SUPPORTED_MIN} +.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} < ${LLVM_SUPPORTED_MIN} LLVM_VER= ${LLVM_SUPPORTED_MIN} -.elif ${LLVM_DEFAULT:S,-devel,990,} > ${LLVM_SUPPORTED_MAX} +.elif ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} > ${LLVM_SUPPORTED_MAX} LLVM_VER= ${LLVM_SUPPORTED_MAX} .else LLVM_VER= ${LLVM_DEFAULT} diff --git a/devel/qtcreator/Makefile b/devel/qtcreator/Makefile index 50c1c8de6cd6..8e0a4eb20a68 100644 --- a/devel/qtcreator/Makefile +++ b/devel/qtcreator/Makefile @@ -84,7 +84,7 @@ SHEBANG_FILES= tests/system/tools/objectsToTable.py \ .include <bsd.port.pre.mk> -.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 LLVM_DEFAULT= 80 .endif diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index 1d27db51de28..73d74a1fac78 100644 --- a/graphics/mesa-dri/Makefile.common +++ b/graphics/mesa-dri/Makefile.common @@ -80,7 +80,7 @@ INSTALL_TARGET= install-strip .if ${ARCH} == powerpc64 LLVM_DEFAULT= 90 -.elif ${LLVM_DEFAULT:S,-devel,990,} >= 90 +.elif ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 LLVM_DEFAULT= 80 .endif diff --git a/security/afl/Makefile b/security/afl/Makefile index 73280ebb604a..1569a0da0da0 100644 --- a/security/afl/Makefile +++ b/security/afl/Makefile @@ -42,7 +42,7 @@ LLVM_VARS= CC=clang${LLVM_DEFAULT} \ .include <bsd.port.options.mk> -.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 LLVM_DEFAULT= 80 .endif |