Switch default devel/llvm* to 90

PR: 239682 Reviewed by: tobik Differential Revision: https://reviews.freebsd.org/D21172
svn path=/head/; revision=512440
2019-09-20 19:58:36 +00:00 · 2019-09-20 19:58:36 +00:00 · 3f1915711d · 2021-03-31 03:12:20 +00:00
commit 3f1915711d
parent c6356441d2
44 changed files with 77 additions and 23 deletions
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@ -57,10 +57,10 @@ JULIA_DEFAULT?=		1.0
 LAZARUS_DEFAULT?=	2.0.4
 # Possible values: c6, c7
 LINUX_DEFAULT?=		c7
-# Possible values: 60, 70, 80, -devel (to be used when non-base compiler is required)
+# Possible values: 60, 70, 80, 90, -devel (to be used when non-base compiler is required)
 # Please give notice to the Graphics Team (x11@FreeBSD.org) in advance before 
 # bumping the LLVM version.
-LLVM_DEFAULT?=		80
+LLVM_DEFAULT?=		90
 # Possible values: 5.1, 5.2, 5.3
 LUA_DEFAULT?=		5.2
 # Possible values: 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 10.2m, 10.3m, 5.5p, 5.6p, 5.7p, 5.6w
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@ -90,6 +90,9 @@ MOZ_MK_OPTIONS+=MOZ_OBJDIR="${BUILD_WRKSRC}"

 # Require newer Clang than what's in base system unless user opted out
 . if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so)
+.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 && ${ARCH} == i386
+LLVM_DEFAULT=	80
+.endif
 BUILD_DEPENDS+=	${LOCALBASE}/bin/clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 CPP=			${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT}
 CC=				${LOCALBASE}/bin/clang${LLVM_DEFAULT}
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	gnuradio
 PORTVERSION=	3.8.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	http://gnuradio.org/releases/gnuradio/

--- a/databases/postgresql11-server/Makefile
+++ b/databases/postgresql11-server/Makefile
@ -4,7 +4,7 @@
 DISTVERSION?=	11.5
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	0
+PORTREVISION?=	1
 PKGNAMESUFFIX?=	${DISTVERSION:R:S/.//}${COMPONENT}

 MAINTAINER?=	pgsql@FreeBSD.org
--- a/databases/postgresql12-server/Makefile
+++ b/databases/postgresql12-server/Makefile
@ -5,7 +5,7 @@ PORTNAME?=	postgresql
 DISTVERSION?=	12beta4
 # PORTREVISION must be ?= otherwise, all slave ports get this PORTREVISION and
 # not their own.  Probably best to keep it at ?=0 when reset here too.
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	databases
 MASTER_SITES=	PGSQL/source/v${DISTVERSION}
 PKGNAMESUFFIX?= ${PORTVERSION:R}${COMPONENT}
--- a/devel/android-tools-simpleperf/Makefile
+++ b/devel/android-tools-simpleperf/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	android-tools-simpleperf
 DISTVERSIONPREFIX=	android-
 DISTVERSION=	7.1.2_r17
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel

 MAINTAINER=	jbeich@FreeBSD.org
--- a/devel/ccls/Makefile
+++ b/devel/ccls/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	ccls
 DISTVERSION=	0.20190823.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/tobik

--- a/devel/clazy/Makefile
+++ b/devel/clazy/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	clazy
 DISTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}/src/

--- a/devel/cloudabi-toolchain/Makefile
+++ b/devel/cloudabi-toolchain/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	cloudabi-toolchain
 PORTVERSION=	1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	# None
 DISTFILES=	# None
--- a/devel/cquery/Makefile
+++ b/devel/cquery/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	cquery
 PORTVERSION=	20180718
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel

 MAINTAINER=	henry.hu.sh@gmail.com
--- a/devel/dmlc-core/Makefile
+++ b/devel/dmlc-core/Makefile
@ -25,4 +25,10 @@ CPP=		clang-cpp${LLVM_DEFAULT}
 CC=		clang${LLVM_DEFAULT}
 CXX=		clang++${LLVM_DEFAULT}

+.include <bsd.port.options.mk>
+
+.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+LLVM_DEFAULT=	80
+.endif
+
 .include <bsd.port.mk>
--- a/devel/ikos/Makefile
+++ b/devel/ikos/Makefile
@ -3,6 +3,7 @@
 PORTNAME=	ikos
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	devel

 MAINTAINER=	yuri@FreeBSD.org
--- a/devel/ispc/Makefile
+++ b/devel/ispc/Makefile
@ -41,4 +41,10 @@ run-examples:
 	./${e}
 .endfor

+.include <bsd.port.options.mk>
+
+.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+LLVM_DEFAULT=	80
+.endif
+
 .include <bsd.port.mk>
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	kdevelop
 DISTVERSION=	5.4.2
+PORTREVISION=	1
 CATEGORIES=	devel kde
 MASTER_SITES=	KDE/stable/kdevelop/${DISTVERSION}/src
 DIST_SUBDIR=	KDE/kdevelop
--- a/devel/libclc/Makefile
+++ b/devel/libclc/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libclc
 DISTVERSION=	0.4.0.20190527
+PORTREVISION=	1
 CATEGORIES=	devel

 MAINTAINER=	x11@FreeBSD.org
--- a/devel/oclgrind/Makefile
+++ b/devel/oclgrind/Makefile
@ -31,4 +31,10 @@ CPP=		clang-cpp${LLVM_DEFAULT}

 CMAKE_ARGS+=	-DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm

+.include <bsd.port.options.mk>
+
+.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+LLVM_DEFAULT=	80
+.endif
+
 .include <bsd.port.mk>
--- a/devel/pijul/Makefile
+++ b/devel/pijul/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	pijul
 PORTVERSION=	0.12.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	https://pijul.org/releases/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
--- a/devel/py-llvmcpy/Makefile
+++ b/devel/py-llvmcpy/Makefile
@ -3,6 +3,7 @@
 PORTNAME=	llvmcpy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.4
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

--- a/devel/qt5-qdoc/Makefile
+++ b/devel/qt5-qdoc/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	qdoc
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel textproc
 PKGNAMEPREFIX=	qt5-

--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@ -85,6 +85,10 @@ SHEBANG_FILES=		tests/system/tools/objectsToTable.py \

 .include <bsd.port.pre.mk>

+.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+LLVM_DEFAULT=	80
+.endif
+
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 PLIST_SUB+=	GCC=""
 .else
--- a/devel/rust-bindgen/Makefile
+++ b/devel/rust-bindgen/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	bindgen
 DISTVERSION=	0.51.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
 PKGNAMEPREFIX=	rust-
--- a/devel/shiboken2/Makefile
+++ b/devel/shiboken2/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	shiboken2
 DISTVERSION=	5.12.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
 DISTNAME=	pyside-setup-everywhere-src-${DISTVERSION}
--- a/editors/jucipp/Makefile
+++ b/editors/jucipp/Makefile
@ -4,6 +4,7 @@
 PORTNAME=	jucipp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	editors

 MAINTAINER=	info@babaei.net
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	mesa-dri
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics

 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
--- a/graphics/pcl-pointclouds/Makefile
+++ b/graphics/pcl-pointclouds/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	pcl
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	1.9.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics math
 PKGNAMESUFFIX=	-pointclouds

--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@ -4,6 +4,7 @@
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_4_11
+PORTREVISION=	1
 CATEGORIES=	graphics geography
 PKGNAMESUFFIX=	-ltr

--- a/lang/beignet/Makefile
+++ b/lang/beignet/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	beignet
 DISTVERSION=	1.3.2
 DISTVERSIONSUFFIX=	-source
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang
 MASTER_SITES=	https://01.org/sites/default/files/

--- a/lang/clover/Makefile
+++ b/lang/clover/Makefile
@ -17,6 +17,11 @@ ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	Clover needs a GPU supported by the Radeon KMS driver

 .include <bsd.port.options.mk>
+
+.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+LLVM_DEFAULT=	80
+.endif
+
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"

 CONFIGURE_ARGS+=	--enable-opencl --enable-opencl-icd --disable-dri \
--- a/lang/rubinius/Makefile
+++ b/lang/rubinius/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	rubinius
 PORTVERSION=	3.86
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	http://releases.rubini.us/:source
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:source
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	thunderbird
 DISTVERSION=	68.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source
--- a/math/casadi/Makefile
+++ b/math/casadi/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	casadi
 DISTVERSION=	3.4.5-49
 DISTVERSIONSUFFIX=	-g6b0de13ac
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math

 MAINTAINER=	yuri@FreeBSD.org
--- a/misc/veles/Makefile
+++ b/misc/veles/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	veles
 DISTVERSION=	2018.05.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc

 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
--- a/net/aluminum/Makefile
+++ b/net/aluminum/Makefile
@ -4,7 +4,7 @@ PORTNAME=	Aluminum
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.1-6
 DISTVERSIONSUFFIX=	-g78fa7ea
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net

 MAINTAINER=	yuri@FreeBSD.org
--- a/net/waypipe/Makefile
+++ b/net/waypipe/Makefile
@ -3,6 +3,7 @@
 PORTNAME=	waypipe
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.1
+PORTREVISION=	0
 CATEGORIES=	net

 MAINTAINER=	jbeich@FreeBSD.org
--- a/science/agrum/Makefile
+++ b/science/agrum/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	agrum
 DISTVERSION=	0.15.2
+PORTREVISION=	1
 CATEGORIES=	science math

 MAINTAINER=	yuri@FreeBSD.org
--- a/science/erkale/Makefile
+++ b/science/erkale/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	erkale
 DISTVERSION=	g20190812
+PORTREVISION=	1
 CATEGORIES=	science

 MAINTAINER=	yuri@FreeBSD.org
--- a/security/afl++/Makefile
+++ b/security/afl++/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	afl
 PORTVERSION=	2.54c
+PORTREVISION=	1
 CATEGORIES=	security
 PKGNAMESUFFIX=	++

--- a/security/afl/Makefile
+++ b/security/afl/Makefile
@ -42,6 +42,10 @@ LLVM_VARS=		CC=clang${LLVM_DEFAULT} \

 .include <bsd.port.options.mk>

+.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+LLVM_DEFAULT=	80
+.endif
+
 .if ${ARCH} == "i386"
 # Clang i386 emits .cfi_sections which base as(1) doesn't understand
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
--- a/security/klee/Makefile
+++ b/security/klee/Makefile
@ -48,4 +48,10 @@ STP_CMAKE_BOOL=		ENABLE_SOLVER_STP
 STP_CMAKE_ON=		-DFREEBSD_STP_STATIC_LIBRARY:STRING=${LOCALBASE}/lib/libstp.a
 STP_BUILD_DEPENDS=	stp>0:math/stp

+.include <bsd.port.options.mk>
+
+.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+LLVM_DEFAULT=	80
+.endif
+
 .include <bsd.port.mk>
--- a/textproc/castxml/Makefile
+++ b/textproc/castxml/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	castxml
 PORTVERSION=	g20181115
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc devel

 MAINTAINER=	yuri@FreeBSD.org
--- a/textproc/sonic/Makefile
+++ b/textproc/sonic/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	sonic
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc

 MAINTAINER=	tobik@FreeBSD.org
--- a/www/cliqz/Makefile
+++ b/www/cliqz/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	cliqz
 DISTVERSION=	1.28.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \
 		http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	firefox
 DISTVERSION=	68.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	firefox
 DISTVERSION=	69.0.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \