svn commit: r369282 - in head: devel/llvm35 devel/llvm35/files lang/clang35

Brooks Davis brooks at FreeBSD.org
Thu Sep 25 18:36:00 UTC 2014 

Author: brooks
Date: Thu Sep 25 18:35:58 2014
New Revision: 369282
URL: http://svnweb.freebsd.org/changeset/ports/369282
QAT: https://qat.redports.org/buildarchive/r369282/

Log:
  Upgrade to 3.5.0 release.
  
  USES=python
  
  Give the port a chance of building on more arm systems and powerpc64. [0]
  
  Allow building on 9 in the default configuration as it works for me.
  Disallow llvm35 on 8 due to bizzare gcc behavior.
  
  PR:		191996 [0]
  Submitted by:	direct727 at gmail.com [0]
  Sponsored by:	DARPA, AFRL

Modified:
  head/devel/llvm35/Makefile
  head/devel/llvm35/distinfo
  head/devel/llvm35/files/patch-utils_llvm-build_llvmbuild_main.py
  head/devel/llvm35/pkg-plist
  head/lang/clang35/Makefile
  head/lang/clang35/distinfo

Modified: head/devel/llvm35/Makefile
==============================================================================
--- head/devel/llvm35/Makefile	Thu Sep 25 18:27:56 2014	(r369281)
+++ head/devel/llvm35/Makefile	Thu Sep 25 18:35:58 2014	(r369282)
@@ -1,11 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	llvm
-DISTVERSION=	3.5.0rc2
-PORTREVISION=	1
+DISTVERSION=	3.5.0
 CATEGORIES=	devel lang
-MASTER_SITES=	http://llvm.org/pre-releases/3.5/rc2/
-#http://llvm.org/pre-releases/3.5/rc2/llvm-3.5.0rc2.src.tar.xz
+MASTER_SITES=	http://llvm.org/releases/3.5.0/
 DISTNAME=	${PORTNAME}-${DISTVERSION}.src
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 
@@ -18,7 +16,7 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 UNIQUENAME=	${PORTNAME}${LLVM_SUFFIX}
 
-WRKSRC=		${WRKDIR}/llvm.src
+WRKSRC=		${WRKDIR}/llvm-${DISTVERSION}.src
 
 USES=		compiler:c++11-lib execinfo gmake perl5 tar:xz
 GNU_CONFIGURE=	yes
@@ -112,10 +110,10 @@ CONFIGURE_ARGS+=	--disable-docs
 
 .if ${PORT_OPTIONS:MLIT}
 MAN1SRCS+=		lit.1
-USE_PYTHON=		yes
+USES+=			python
 LIT_COMMANDS=		lit llvm-lit FileCheck
 .else
-USE_PYTHON_BUILD=	yes
+USES+=			python:build
 .endif
 
 .if ${PORT_OPTIONS:MLTOPLUGIN}
@@ -137,6 +135,10 @@ NOT_FOR_ARCH=	ia64
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 900000
+BROKEN=	GCC failing on 8.x
+.endif
+
 .if ${PORT_OPTIONS:MCMAKE} && ${COMPILER_TYPE} != clang
 BROKEN=	CMake support only works with clang
 .endif

Modified: head/devel/llvm35/distinfo
==============================================================================
--- head/devel/llvm35/distinfo	Thu Sep 25 18:27:56 2014	(r369281)
+++ head/devel/llvm35/distinfo	Thu Sep 25 18:35:58 2014	(r369282)
@@ -1,2 +1,2 @@
-SHA256 (llvm-3.5.0rc2.src.tar.xz) = 962130e3c1916e5a393675276af709d61a34d272c62d655baa9d966d0b87adde
-SIZE (llvm-3.5.0rc2.src.tar.xz) = 11770380
+SHA256 (llvm-3.5.0.src.tar.xz) = 28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03
+SIZE (llvm-3.5.0.src.tar.xz) = 11735940

Modified: head/devel/llvm35/files/patch-utils_llvm-build_llvmbuild_main.py
==============================================================================
--- head/devel/llvm35/files/patch-utils_llvm-build_llvmbuild_main.py	Thu Sep 25 18:27:56 2014	(r369281)
+++ head/devel/llvm35/files/patch-utils_llvm-build_llvmbuild_main.py	Thu Sep 25 18:35:58 2014	(r369282)
@@ -3,16 +3,20 @@ $FreeBSD$
 
 --- utils/llvm-build/llvmbuild/main.py.orig
 +++ utils/llvm-build/llvmbuild/main.py
-@@ -633,7 +633,13 @@
+@@ -660,7 +660,17 @@
  
      # We handle a few special cases of target names here for historical
      # reasons, as these are the names configure currently comes up with.
 -    native_target_name = { 'x86' : 'X86',
 +    native_target_name = { 'amd64' : 'X86',
 +			   'arm' : 'ARM',
++			   'armeb' : 'ARM',
++			   'armv6' : 'ARM',
++			   'armv6hf' : 'ARM',
 +			   'i386' : 'X86',
 +			   'mips' : 'Mips',
 +			   'powerpc' : 'PowerPC',
++			   'powerpc64' : 'PowerPC',
 +			   'sparc64' : 'Sparc',
 +                           'x86' : 'X86',
                             'x86_64' : 'X86',

Modified: head/devel/llvm35/pkg-plist
==============================================================================
--- head/devel/llvm35/pkg-plist	Thu Sep 25 18:27:56 2014	(r369281)
+++ head/devel/llvm35/pkg-plist	Thu Sep 25 18:35:58 2014	(r369282)
@@ -670,7 +670,7 @@ llvm%%LLVM_SUFFIX%%/include/llvm/Transfo
 llvm%%LLVM_SUFFIX%%/include/llvm/Transforms/Vectorize.h
 llvm%%LLVM_SUFFIX%%/lib/BugpointPasses.so
 llvm%%LLVM_SUFFIX%%/lib/LLVMHello.so
-llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.5.0.so
+llvm%%LLVM_SUFFIX%%/lib/libLLVM-%%PORTVERSION%%.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.5.so
 llvm%%LLVM_SUFFIX%%/lib/libLLVM-3.5.so.0
 llvm%%LLVM_SUFFIX%%/lib/libLLVMAArch64AsmParser.a

Modified: head/lang/clang35/Makefile
==============================================================================
--- head/lang/clang35/Makefile	Thu Sep 25 18:27:56 2014	(r369281)
+++ head/lang/clang35/Makefile	Thu Sep 25 18:35:58 2014	(r369282)
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	clang
-DISTVERSION=	3.5.0rc2
-PORTREVISION=	1
+DISTVERSION=	3.5.0
 CATEGORIES=	lang devel
-MASTER_SITES=   http://llvm.org/pre-releases/3.5/rc2/
+MASTER_SITES=   http://llvm.org/releases/3.5.0/
 PKGNAMESUFFIX=	${LLVM_SUFFIX}
 DISTNAME=	${CLANG_NAME}
 DISTFILES=	${CLANG_SOURCE} \
@@ -15,10 +14,10 @@ COMMENT=	C, Objective-C, and C++ compile
 
 CLANG_NAME=	cfe-${DISTVERSION}.src
 CLANG_SOURCE=	${CLANG_NAME}${EXTRACT_SUFX}
-CLANG_EXTRACT=	cfe.src
+CLANG_EXTRACT=	cfe-${DISTVERSION}.src
 LLVM_NAME=	llvm-${DISTVERSION}.src
 LLVM_SOURCE=	${LLVM_NAME}${EXTRACT_SUFX}
-LLVM_EXTRACT=	llvm.src
+LLVM_EXTRACT=	llvm-${DISTVERSION}.src
 LIBNAME=	libLLVM-3.5.so
 
 WRKSRC=		${WRKDIR}/${LLVM_EXTRACT}
@@ -35,9 +34,8 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_PREFIX=	${LLVM_PREFIX}
-USES=		compiler:c++11-lib gmake perl5 tar:xz
+USES=		compiler:c++11-lib gmake perl5 python:build tar:xz
 USE_LDCONFIG=	yes
-USE_PYTHON_BUILD=	yes
 
 MAKE_ARGS=	CLANG_TBLGEN=${WRKSRC}/${RELTYPE}/bin/clang-tblgen \
 		LLVMIncDir=${LLVM_PREFIX}/include \
@@ -85,10 +83,6 @@ RELTYPE=		Release
 
 .include <bsd.port.pre.mk>
 
-.if ${COMPILER_TYPE} != clang
-BROKEN=	link errors when build with gcc
-.endif
-
 .if ${PORT_OPTIONS:MASSERTS}
 pre-fetch:
 	@if [ "`llvm-config${LLVM_SUFFIX} --build-mode`" != ${RELTYPE} ]; then \

Modified: head/lang/clang35/distinfo
==============================================================================
--- head/lang/clang35/distinfo	Thu Sep 25 18:27:56 2014	(r369281)
+++ head/lang/clang35/distinfo	Thu Sep 25 18:35:58 2014	(r369282)
@@ -1,4 +1,4 @@
-SHA256 (cfe-3.5.0rc2.src.tar.xz) = a2202993744dfba25154b59c4e4c982d58f44b0c627109c418daab2606c828af
-SIZE (cfe-3.5.0rc2.src.tar.xz) = 8231116
-SHA256 (llvm-3.5.0rc2.src.tar.xz) = 962130e3c1916e5a393675276af709d61a34d272c62d655baa9d966d0b87adde
-SIZE (llvm-3.5.0rc2.src.tar.xz) = 11770380
+SHA256 (cfe-3.5.0.src.tar.xz) = fc80992e004b06f6c7afb612de1cdaa9ac9d25811c55f94fcf7331d9b81cdb8b
+SIZE (cfe-3.5.0.src.tar.xz) = 8233432
+SHA256 (llvm-3.5.0.src.tar.xz) = 28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03
+SIZE (llvm-3.5.0.src.tar.xz) = 11735940

More information about the svn-ports-head mailing list