Date: Mon, 11 May 2020 20:11:41 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534936 - in head: devel/libclc devel/oclgrind devel/py-llvmlite devel/qtcreator graphics/mesa-dri security/afl Message-ID: <202005112011.04BKBfCf091008@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Mon May 11 20:11:41 2020 New Revision: 534936 URL: https://svnweb.freebsd.org/changeset/ports/534936 Log: 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 Modified: head/devel/libclc/Makefile (contents, props changed) head/devel/oclgrind/Makefile (contents, props changed) head/devel/py-llvmlite/Makefile (contents, props changed) head/devel/qtcreator/Makefile (contents, props changed) head/graphics/mesa-dri/Makefile.common (contents, props changed) head/security/afl/Makefile (contents, props changed) Modified: head/devel/libclc/Makefile ============================================================================== --- head/devel/libclc/Makefile Mon May 11 19:50:28 2020 (r534935) +++ head/devel/libclc/Makefile Mon May 11 20:11:41 2020 (r534936) @@ -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: head/devel/oclgrind/Makefile ============================================================================== --- head/devel/oclgrind/Makefile Mon May 11 19:50:28 2020 (r534935) +++ head/devel/oclgrind/Makefile Mon May 11 20:11:41 2020 (r534936) @@ -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: head/devel/py-llvmlite/Makefile ============================================================================== --- head/devel/py-llvmlite/Makefile Mon May 11 19:50:28 2020 (r534935) +++ head/devel/py-llvmlite/Makefile Mon May 11 20:11:41 2020 (r534936) @@ -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: head/devel/qtcreator/Makefile ============================================================================== --- head/devel/qtcreator/Makefile Mon May 11 19:50:28 2020 (r534935) +++ head/devel/qtcreator/Makefile Mon May 11 20:11:41 2020 (r534936) @@ -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 Modified: head/graphics/mesa-dri/Makefile.common ============================================================================== --- head/graphics/mesa-dri/Makefile.common Mon May 11 19:50:28 2020 (r534935) +++ head/graphics/mesa-dri/Makefile.common Mon May 11 20:11:41 2020 (r534936) @@ -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 Modified: head/security/afl/Makefile ============================================================================== --- head/security/afl/Makefile Mon May 11 19:50:28 2020 (r534935) +++ head/security/afl/Makefile Mon May 11 20:11:41 2020 (r534936) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005112011.04BKBfCf091008>