From owner-svn-ports-head@freebsd.org Mon May 11 20:11:42 2020 Return-Path: Delivered-To: svn-ports-head@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 BAED72EA29E; Mon, 11 May 2020 20:11:42 +0000 (UTC) (envelope-from jbeich@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) server-signature RSA-PSS (4096 bits) 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 49LXC248NVz42Gx; Mon, 11 May 2020 20:11:42 +0000 (UTC) (envelope-from jbeich@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 89B7A23F0F; Mon, 11 May 2020 20:11:42 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04BKBg02092797; Mon, 11 May 2020 20:11:42 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04BKBfCf091008; Mon, 11 May 2020 20:11:41 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202005112011.04BKBfCf091008@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 11 May 2020 20:11:41 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head: devel/libclc devel/oclgrind devel/py-llvmlite devel/qtcreator graphics/mesa-dri security/afl X-SVN-Commit-Revision: 534936 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 May 2020 20:11:42 -0000 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 # 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 -.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 -.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 -.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 -.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +.if ${LLVM_DEFAULT:C/[1-5]./&0/:S,-devel,990,} >= 90 LLVM_DEFAULT= 80 .endif