svn commit: r369255 - in head/devel: llvm33 llvm33/files llvm34 llvm34/files

[Brooks Davis]

Author: brooks
Date: Thu Sep 25 14:01:33 2014
New Revision: 369255
URL: http://svnweb.freebsd.org/changeset/ports/369255
QAT: https://qat.redports.org/buildarchive/r369255/

Log:
  Enable builds on/for Raspberry Pi and other arm variants.
  
  USES=python
  
  PR:		191996
  Submitted by:	direct727 at gmail.com
  Sponsored by:	DARPA, AFRL

Modified:
  head/devel/llvm33/Makefile
  head/devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py
  head/devel/llvm34/Makefile
  head/devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py

Modified: head/devel/llvm33/Makefile
==============================================================================
--- head/devel/llvm33/Makefile	Thu Sep 25 13:56:06 2014	(r369254)
+++ head/devel/llvm33/Makefile	Thu Sep 25 14:01:33 2014	(r369255)
@@ -110,10 +110,10 @@ CONFIGURE_ARGS+=	--disable-docs
 
 .if ${PORT_OPTIONS:MLIT}
 MAN1SRCS+=		lit.1
-USE_PYTHON=		-2.9
+USES+=			python:-2.9
 LIT_COMMANDS=		lit llvm-lit FileCheck
 .else
-USE_PYTHON_BUILD=	-2.9
+USES+=			python:-2.9:build
 .endif
 
 .if ${PORT_OPTIONS:MLTOPLUGIN}

Modified: head/devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py
==============================================================================
--- head/devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py	Thu Sep 25 13:56:06 2014	(r369254)
+++ head/devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py	Thu Sep 25 14:01:33 2014	(r369255)
@@ -3,13 +3,16 @@ $FreeBSD$
 
 --- utils/llvm-build/llvmbuild/main.py.orig
 +++ utils/llvm-build/llvmbuild/main.py
-@@ -633,7 +633,13 @@
+@@ -652,7 +652,16 @@
  
      # 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',

Modified: head/devel/llvm34/Makefile
==============================================================================
--- head/devel/llvm34/Makefile	Thu Sep 25 13:56:06 2014	(r369254)
+++ head/devel/llvm34/Makefile	Thu Sep 25 14:01:33 2014	(r369255)
@@ -110,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}

Modified: head/devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py
==============================================================================
--- head/devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py	Thu Sep 25 13:56:06 2014	(r369254)
+++ head/devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py	Thu Sep 25 14:01:33 2014	(r369255)
@@ -3,13 +3,16 @@ $FreeBSD$
 
 --- utils/llvm-build/llvmbuild/main.py.orig
 +++ utils/llvm-build/llvmbuild/main.py
-@@ -633,7 +633,13 @@
+@@ -699,7 +699,16 @@
  
      # 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',