svn commit: r535352 - in branches/2020Q2: devel/libclc devel/oclgrind devel/py-llvmlite devel/qtcreator graphics/mesa-dri security/afl
Jan Beich
jbeich at FreeBSD.org
Sat May 16 04:45:53 UTC 2020
Author: jbeich
Date: Sat May 16 04:45:51 2020
New Revision: 535352
URL: https://svnweb.freebsd.org/changeset/ports/535352
Log:
MFH: r534936
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)
Approved by: ports-secteam (joneum)
Differential Revision: https://reviews.freebsd.org/D24222
Modified:
branches/2020Q2/devel/libclc/Makefile
branches/2020Q2/devel/oclgrind/Makefile
branches/2020Q2/devel/py-llvmlite/Makefile
branches/2020Q2/devel/qtcreator/Makefile
branches/2020Q2/graphics/mesa-dri/Makefile.common
branches/2020Q2/security/afl/Makefile
Directory Properties:
branches/2020Q2/ (props changed)
Modified: branches/2020Q2/devel/libclc/Makefile
==============================================================================
--- branches/2020Q2/devel/libclc/Makefile Sat May 16 04:41:48 2020 (r535351)
+++ branches/2020Q2/devel/libclc/Makefile Sat May 16 04:45:51 2020 (r535352)
@@ -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
Modified: branches/2020Q2/devel/oclgrind/Makefile
==============================================================================
--- branches/2020Q2/devel/oclgrind/Makefile Sat May 16 04:41:48 2020 (r535351)
+++ branches/2020Q2/devel/oclgrind/Makefile Sat May 16 04:45:51 2020 (r535352)
@@ -33,7 +33,7 @@ CMAKE_ARGS+= -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAUL
.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
Modified: branches/2020Q2/devel/py-llvmlite/Makefile
==============================================================================
--- branches/2020Q2/devel/py-llvmlite/Makefile Sat May 16 04:41:48 2020 (r535351)
+++ branches/2020Q2/devel/py-llvmlite/Makefile Sat May 16 04:45:51 2020 (r535352)
@@ -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}
Modified: branches/2020Q2/devel/qtcreator/Makefile
==============================================================================
--- branches/2020Q2/devel/qtcreator/Makefile Sat May 16 04:41:48 2020 (r535351)
+++ branches/2020Q2/devel/qtcreator/Makefile Sat May 16 04:45:51 2020 (r535352)
@@ -86,7 +86,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
Modified: branches/2020Q2/graphics/mesa-dri/Makefile.common
==============================================================================
--- branches/2020Q2/graphics/mesa-dri/Makefile.common Sat May 16 04:41:48 2020 (r535351)
+++ branches/2020Q2/graphics/mesa-dri/Makefile.common Sat May 16 04:45:51 2020 (r535352)
@@ -79,7 +79,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
Modified: branches/2020Q2/security/afl/Makefile
==============================================================================
--- branches/2020Q2/security/afl/Makefile Sat May 16 04:41:48 2020 (r535351)
+++ branches/2020Q2/security/afl/Makefile Sat May 16 04:45:51 2020 (r535352)
@@ -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
More information about the svn-ports-all
mailing list