From bfa57ac58b9dd1c814888957adebbde5471a5c6f Mon Sep 17 00:00:00 2001 From: Brooks Davis Date: Tue, 31 Mar 2015 14:33:33 +0000 Subject: [PATCH] Catch the set of host platforms up to the set in llvm ports. To revision bump as it only effects building the port on platforms that would fail before. --- .../files/patch-utils_llvm-build_llvmbuild_main.py | 6 +++++- lang/clang33/files/patch-utils_llvm-build_llvmbuild_main.py | 6 +++++- lang/clang34/files/patch-utils_llvm-build_llvmbuild_main.py | 6 +++++- lang/clang35/files/patch-utils_llvm-build_llvmbuild_main.py | 6 +++++- lang/clang36/files/patch-utils_llvm-build_llvmbuild_main.py | 6 +++++- 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/lang/clang-devel/files/patch-utils_llvm-build_llvmbuild_main.py b/lang/clang-devel/files/patch-utils_llvm-build_llvmbuild_main.py index 1e2de0273d55..ca34c8a2fe85 100644 --- a/lang/clang-devel/files/patch-utils_llvm-build_llvmbuild_main.py +++ b/lang/clang-devel/files/patch-utils_llvm-build_llvmbuild_main.py @@ -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', diff --git a/lang/clang33/files/patch-utils_llvm-build_llvmbuild_main.py b/lang/clang33/files/patch-utils_llvm-build_llvmbuild_main.py index 1e2de0273d55..ca34c8a2fe85 100644 --- a/lang/clang33/files/patch-utils_llvm-build_llvmbuild_main.py +++ b/lang/clang33/files/patch-utils_llvm-build_llvmbuild_main.py @@ -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', diff --git a/lang/clang34/files/patch-utils_llvm-build_llvmbuild_main.py b/lang/clang34/files/patch-utils_llvm-build_llvmbuild_main.py index 1e2de0273d55..ca34c8a2fe85 100644 --- a/lang/clang34/files/patch-utils_llvm-build_llvmbuild_main.py +++ b/lang/clang34/files/patch-utils_llvm-build_llvmbuild_main.py @@ -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', diff --git a/lang/clang35/files/patch-utils_llvm-build_llvmbuild_main.py b/lang/clang35/files/patch-utils_llvm-build_llvmbuild_main.py index 1e2de0273d55..ca34c8a2fe85 100644 --- a/lang/clang35/files/patch-utils_llvm-build_llvmbuild_main.py +++ b/lang/clang35/files/patch-utils_llvm-build_llvmbuild_main.py @@ -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', diff --git a/lang/clang36/files/patch-utils_llvm-build_llvmbuild_main.py b/lang/clang36/files/patch-utils_llvm-build_llvmbuild_main.py index 1e2de0273d55..ca34c8a2fe85 100644 --- a/lang/clang36/files/patch-utils_llvm-build_llvmbuild_main.py +++ b/lang/clang36/files/patch-utils_llvm-build_llvmbuild_main.py @@ -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',