From 2b5df718539d6affc213426e8f9157679e86ffb3 Mon Sep 17 00:00:00 2001
From: brooks <brooks@FreeBSD.org>
Date: Thu, 25 Sep 2014 14:01:33 +0000
Subject: Enable builds on/for Raspberry Pi and other arm variants.

USES=python

PR:		191996
Submitted by:	direct727@gmail.com
Sponsored by:	DARPA, AFRL
---
 devel/llvm33/Makefile                                       | 4 ++--
 devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py | 5 ++++-
 devel/llvm34/Makefile                                       | 4 ++--
 devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py | 5 ++++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/devel/llvm33/Makefile b/devel/llvm33/Makefile
index f6a160fc55eb..55d35d896dd6 100644
--- a/devel/llvm33/Makefile
+++ b/devel/llvm33/Makefile
@@ -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}
diff --git a/devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py b/devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py
index 1e2de0273d55..723eeec33f82 100644
--- a/devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py
+++ b/devel/llvm33/files/patch-utils_llvm-build_llvmbuild_main.py
@@ -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',
diff --git a/devel/llvm34/Makefile b/devel/llvm34/Makefile
index 41687ae0522d..171423f81fa9 100644
--- a/devel/llvm34/Makefile
+++ b/devel/llvm34/Makefile
@@ -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}
diff --git a/devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py b/devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py
index 1e2de0273d55..1ce78539be13 100644
--- a/devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py
+++ b/devel/llvm34/files/patch-utils_llvm-build_llvmbuild_main.py
@@ -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',
-- 
cgit