Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Sep 2018 02:47:24 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r480151 - head/devel/llvm70
Message-ID:  <201809200247.w8K2lO74078886@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brooks
Date: Thu Sep 20 02:47:24 2018
New Revision: 480151
URL: https://svnweb.freebsd.org/changeset/ports/480151

Log:
  Update to LLVM 7.0.0 Release.
  
  Update LICENSE to include additional licenses of sub-components.
  
  Enable LLDB and OPENMP on 10. [0]
  
  PR:		229570 [0]
  Submitted by:	Rainer Hurling <rhurlin@gwdg.de> [0]
  Sponsored by:	DARPA, AFRL

Modified:
  head/devel/llvm70/Makefile
  head/devel/llvm70/distinfo

Modified: head/devel/llvm70/Makefile
==============================================================================
--- head/devel/llvm70/Makefile	Thu Sep 20 01:22:59 2018	(r480150)
+++ head/devel/llvm70/Makefile	Thu Sep 20 02:47:24 2018	(r480151)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	7.0.0rc3
+DISTVERSION=	7.0.0
 PORTREVISION=	0
 CATEGORIES=	devel lang
 MASTER_SITES=	http://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
@@ -12,10 +12,23 @@ DISTFILES=	${PORTNAME}-${DISTVERSION}.src${EXTRACT_SUF
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM and Clang
 
-LICENSE=	LLVM
-LICENSE_NAME=	LLVM Release License
-LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+# License are listed in the order they appear in LICENSE.TXT
+LICENSE=        LLVM GTEST REGEX MIT ARM PD
+LICENSE_COMB=   multi
+LICENSE_NAME_LLVM=      LLVM Release License
+LICENSE_NAME_GTEST=     Google test license
+LICENSE_NAME_REGEX=     OpenBSD Regex License
+# pyyaml tests are under the MIT license
+LICENSE_NAME_ARM=       ARM Limited license
+# md5 is in the public domain
+LICENSE_FILE_LLVM=      ${WRKSRC}/LICENSE.TXT
+LICENSE_FILE_GTEST=     ${WRKSRC}/utils/unittest/googletest/LICENSE.TXT
+LICENSE_FILE_REGEX=     ${WRKSRC}/lib/Support/COPYRIGHT.regex
+LICENSE_FILE_ARM=       ${WRKSRC}/lib/Target/ARM/LICENSE.TXT
+LICENSE_PERMS_LLVM=     dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_GTEST=    dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_REGEX=    dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_PERMS_ARM=      dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LLVM_RELEASE=	${DISTVERSION:C/rc.*//}
 LLVM_MAJOR=	${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//}
@@ -55,7 +68,6 @@ OPTIONS_DEFINE_i386=	COMPILER_RT OPENMP
 OPTIONS_DEFAULT=	CLANG EXTRAS LIT LLD LLDB
 OPTIONS_DEFAULT_amd64=	COMPILER_RT GOLD OPENMP
 OPTIONS_DEFAULT_i386=	COMPILER_RT OPENMP
-OPTIONS_EXCLUDE_FreeBSD_10=	LLDB OPENMP
 OPTIONS_SUB=	yes
 
 CLANG_DESC=	Build clang
@@ -528,12 +540,12 @@ build-plist:
 	    if ($$0 ~ /${COMPILER_RT_PATTERN}/) \
 		{printf "%%%%COMPILER_RT%%%%"} \
 	    if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \
-	    if ($$0 ~ /libclangDoc.a/) {printf "%%%%DOCS%%%%"} \
-	    if ($$0 ~ /lld|wasm-ld/ && $$0 !~ /lldb/) {printf "%%%%LLD%%%%"} \
+	    if ($$0 ~ /(libclangDoc.a)/) {printf "%%%%DOCS%%%%"} \
+	    if ($$0 ~ /(lld|wasm-ld)/ && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \
 	    if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \
-	    if ($$0 ~ /lib.*omp|omp.h|ompt.h/) {printf "%%%%OPENMP%%%%"} \
-	    if ($$0 ~ /LLVMgold/) {printf "%%%%GOLD%%%%"} \
-	    if ($$0 !~ /libclang_rt/) {print}}' ${PLIST}.tmp >> ${PLIST}
+	    if ($$0 ~ /(lib.*omp|omp.h|ompt.h)/) {printf "%%%%OPENMP%%%%"} \
+	    if ($$0 ~ /(LLVMgold)/) {printf "%%%%GOLD%%%%"} \
+	    if ($$0 !~ /(libclang_rt)/) {print}}' ${PLIST}.tmp >> ${PLIST}
 	${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
 	${ECHO_CMD} '@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST}
 	${RM} ${PLIST}.tmp

Modified: head/devel/llvm70/distinfo
==============================================================================
--- head/devel/llvm70/distinfo	Thu Sep 20 01:22:59 2018	(r480150)
+++ head/devel/llvm70/distinfo	Thu Sep 20 02:47:24 2018	(r480151)
@@ -1,15 +1,15 @@
-TIMESTAMP = 1536769635
-SHA256 (llvm-7.0.0rc3.src.tar.xz) = 0adba9857ccf69d7456dba26961846986c9eca0befd3a519ea0c838872d64864
-SIZE (llvm-7.0.0rc3.src.tar.xz) = 28322024
-SHA256 (cfe-7.0.0rc3.src.tar.xz) = ec3258b3d0bb950e90db7f16c8542a34f9a7e2fe95cf20d178455c6a44bc4aa1
-SIZE (cfe-7.0.0rc3.src.tar.xz) = 12541108
-SHA256 (compiler-rt-7.0.0rc3.src.tar.xz) = 8108718f605b949dfa6c8c6d8c74089f2fbe5a287adcac08956d0213217a9064
-SIZE (compiler-rt-7.0.0rc3.src.tar.xz) = 1814052
-SHA256 (clang-tools-extra-7.0.0rc3.src.tar.xz) = c71e69d615346561de5bfc168210cc1173e46289fe8ccef307a159f1c8a71b66
-SIZE (clang-tools-extra-7.0.0rc3.src.tar.xz) = 903168
-SHA256 (lld-7.0.0rc3.src.tar.xz) = 2d16a09306238c319fedc020a3e13a463c78a633b21151f486a1eb3b23f6e882
-SIZE (lld-7.0.0rc3.src.tar.xz) = 915096
-SHA256 (lldb-7.0.0rc3.src.tar.xz) = f7d9d6141bd8880f0e3c2ddc70b08dbccdfe0777ba1269c752ebdb82b08a52e8
-SIZE (lldb-7.0.0rc3.src.tar.xz) = 19404260
-SHA256 (openmp-7.0.0rc3.src.tar.xz) = bc4d2d64838f8a311b9c4311911da71220acc789eb53fd5dcfa54258b0a411a5
-SIZE (openmp-7.0.0rc3.src.tar.xz) = 910604
+TIMESTAMP = 1537379349
+SHA256 (llvm-7.0.0.src.tar.xz) = 8bc1f844e6cbde1b652c19c1edebc1864456fd9c78b8c1bea038e51b363fe222
+SIZE (llvm-7.0.0.src.tar.xz) = 28324368
+SHA256 (cfe-7.0.0.src.tar.xz) = 550212711c752697d2f82c648714a7221b1207fd9441543ff4aa9e3be45bba55
+SIZE (cfe-7.0.0.src.tar.xz) = 12541904
+SHA256 (compiler-rt-7.0.0.src.tar.xz) = bdec7fe3cf2c85f55656c07dfb0bd93ae46f2b3dd8f33ff3ad6e7586f4c670d6
+SIZE (compiler-rt-7.0.0.src.tar.xz) = 1815168
+SHA256 (clang-tools-extra-7.0.0.src.tar.xz) = 937c5a8c8c43bc185e4805144744799e524059cac877a44d9063926cd7a19dbe
+SIZE (clang-tools-extra-7.0.0.src.tar.xz) = 902780
+SHA256 (lld-7.0.0.src.tar.xz) = fbcf47c5e543f4cdac6bb9bbbc6327ff24217cd7eafc5571549ad6d237287f9c
+SIZE (lld-7.0.0.src.tar.xz) = 915692
+SHA256 (lldb-7.0.0.src.tar.xz) = 7ff6d8fee49977d25b3b69be7d22937b92592c7609cf283ed0dcf9e5cd80aa32
+SIZE (lldb-7.0.0.src.tar.xz) = 19403012
+SHA256 (openmp-7.0.0.src.tar.xz) = 30662b632f5556c59ee9215c1309f61de50b3ea8e89dcc28ba9a9494bba238ff
+SIZE (openmp-7.0.0.src.tar.xz) = 910680



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809200247.w8K2lO74078886>