llvm: Removed 2.5 and 2.6 and both native variants.

9 files changed, 3 insertions, 109 deletions

diff --git a/recipes/llvm/llvm2.5-native_2.5.bb b/recipes/llvm/llvm2.5-native_2.5.bb
deleted file mode 100644
index 416e0683b7..0000000000
--- a/recipes/llvm/llvm2.5-native_2.5.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require llvm-native.inc
-
-SRC_URI += "file://fix-build.patch"
-
-
-SRC_URI[md5sum] = "55df2ea8665c8094ad2ef85187b9fc74"
-SRC_URI[sha256sum] = "8f3d69e63bc5d1ee2c2ee49ff07ccb7e070070a0e937813d2a6179b9e2e173ed"
diff --git a/recipes/llvm/llvm2.5/fix-build.patch b/recipes/llvm/llvm2.5/fix-build.patch
deleted file mode 100644
index 527823c18c..0000000000
--- a/recipes/llvm/llvm2.5/fix-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: llvm-2.5/tools/llvm-config/CMakeLists.txt
-===================================================================
---- llvm-2.5.orig/tools/llvm-config/CMakeLists.txt	2009-01-07 20:24:44.000000000 +0100
-+++ llvm-2.5/tools/llvm-config/CMakeLists.txt	2009-03-23 13:45:24.000000000 +0100
-@@ -83,13 +83,13 @@
-   COMMENT "Checking for cyclic dependencies between LLVM libraries.")
- 
- add_custom_command(OUTPUT ${LLVM_CONFIG}
--  COMMAND echo 's,@LLVM_CPPFLAGS@,${CMAKE_CPP_FLAGS},' > temp.sed
--  COMMAND echo 's,@LLVM_CFLAGS@,${CMAKE_C_FLAGS},' >> temp.sed
--  COMMAND echo 's,@LLVM_CXXFLAGS@,${CMAKE_CXX_FLAGS},' >> temp.sed
-+  COMMAND echo 's!@LLVM_CPPFLAGS@!${CMAKE_CPP_FLAGS}!' > temp.sed
-+  COMMAND echo 's!@LLVM_CFLAGS@!${CMAKE_C_FLAGS} -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS!' >> temp.sed
-+  COMMAND echo 's!@LLVM_CXXFLAGS@!${CMAKE_CXX_FLAGS} -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -fpermissive -fvisibility-inlines-hidden -Woverloaded-virtual!' >> temp.sed
-   # TODO: Use general flags for linking, not just for shared libs:
--  COMMAND echo 's,@LLVM_LDFLAGS@,${CMAKE_SHARED_LINKER_FLAGS},' >> temp.sed
--  COMMAND echo 's,@LIBS@,,' >> temp.sed                    # TODO: System libs
--  COMMAND echo 's,@LLVM_BUILDMODE@,${CMAKE_BUILD_TYPE},' >> temp.sed
-+  COMMAND echo 's!@LLVM_LDFLAGS@!${CMAKE_SHARED_LINKER_FLAGS}!' >> temp.sed
-+  COMMAND echo 's!@LIBS@!!' >> temp.sed                    # TODO: System libs
-+  COMMAND echo 's!@LLVM_BUILDMODE@!${CMAKE_BUILD_TYPE}!' >> temp.sed
-   COMMAND sed -f temp.sed < ${LLVM_CONFIG_IN} > ${LLVM_CONFIG}
-   COMMAND ${CMAKE_COMMAND} -E remove -f temp.sed
-   COMMAND cat ${FINAL_LIBDEPS} >> ${LLVM_CONFIG}
diff --git a/recipes/llvm/llvm2.5_2.5.bb b/recipes/llvm/llvm2.5_2.5.bb
deleted file mode 100644
index 301aa47365..0000000000
--- a/recipes/llvm/llvm2.5_2.5.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require llvm.inc
-
-SRC_URI += "file://fix-build.patch"
-
-
-SRC_URI[md5sum] = "55df2ea8665c8094ad2ef85187b9fc74"
-SRC_URI[sha256sum] = "8f3d69e63bc5d1ee2c2ee49ff07ccb7e070070a0e937813d2a6179b9e2e173ed"
diff --git a/recipes/llvm/llvm2.6-native_2.6.bb b/recipes/llvm/llvm2.6-native_2.6.bb
deleted file mode 100644
index dec132a8c1..0000000000
--- a/recipes/llvm/llvm2.6-native_2.6.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require llvm-native.inc
-
-PR = "r0"
-
-SRC_URI += "\
-  file://fix-build.patch \
-  file://llvm-debugonly-zeroormore.patch;striplevel=0 \
-"
-
-LLVM_RELEASE = "2.6"
-
-SRC_URI[md5sum] = "34a11e807add0f4555f691944e1a404a"
-SRC_URI[sha256sum] = "4cd9257350c5ff8b9b139d19497e2396c0604eef0e5d6504f5c1463b09bf2d84"
diff --git a/recipes/llvm/llvm2.6/BX_to_BLX.patch b/recipes/llvm/llvm2.6/BX_to_BLX.patch
deleted file mode 100644
index 7cf36766af..0000000000
--- a/recipes/llvm/llvm2.6/BX_to_BLX.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: llvm/lib/Target/ARM/ARMInstrInfo.td
-===================================================================
---- llvm.orig/lib/Target/ARM/ARMInstrInfo.td	2009-10-06 12:35:26.000000000 +0000
-+++ llvm/lib/Target/ARM/ARMInstrInfo.td	2009-10-06 12:36:03.000000000 +0000
-@@ -645,7 +645,7 @@
-                   IIC_Br, "mov lr, pc\n\tbx $func",
-                   [(ARMcall_nolink GPR:$func)]>,
-            Requires<[IsARM, IsNotDarwin]> {
--    let Inst{7-4}   = 0b0001;
-+    let Inst{7-4}   = 0b0011;
-     let Inst{19-8}  = 0b111111111111;
-     let Inst{27-20} = 0b00010010;
-   }
diff --git a/recipes/llvm/llvm2.6/fix-build.patch b/recipes/llvm/llvm2.6/fix-build.patch
deleted file mode 100644
index 39b8d1dc30..0000000000
--- a/recipes/llvm/llvm2.6/fix-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: trunk/tools/llvm-config/CMakeLists.txt
-===================================================================
---- trunk.orig/tools/llvm-config/CMakeLists.txt	2009-04-10 11:56:56.000000000 +0200
-+++ trunk/tools/llvm-config/CMakeLists.txt	2009-04-10 12:21:19.000000000 +0200
-@@ -90,7 +90,7 @@
- add_custom_command(OUTPUT ${LLVM_CONFIG}
-   COMMAND echo 's!@LLVM_CPPFLAGS@!${CPP_FLGS}!' > temp.sed
-   COMMAND echo 's!@LLVM_CFLAGS@!${C_FLGS}!' >> temp.sed
--  COMMAND echo 's!@LLVM_CXXFLAGS@!${CXX_FLGS}!' >> temp.sed
-+  COMMAND echo 's!@LLVM_CXXFLAGS@!${CXX_FLGS} -fpermissive -fvisibility-inlines-hidden -Woverloaded-virtual!' >> temp.sed
-   # TODO: Use general flags for linking! not just for shared libs:
-   COMMAND echo 's!@LLVM_LDFLAGS@!${CMAKE_SHARED_LINKER_FLAGS}!' >> temp.sed
-   COMMAND echo 's!@LIBS@!!' >> temp.sed                    # TODO: System libs
diff --git a/recipes/llvm/llvm2.6/llvm-debugonly-zeroormore.patch b/recipes/llvm/llvm2.6/llvm-debugonly-zeroormore.patch
deleted file mode 100644
index 8888884ea5..0000000000
--- a/recipes/llvm/llvm2.6/llvm-debugonly-zeroormore.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Support/Debug.cpp
-===================================================================
---- lib/Support/Debug.cpp	(Revision 71077)
-+++ lib/Support/Debug.cpp	(Arbeitskopie)
-@@ -48,7 +48,7 @@
-   static cl::opt<DebugOnlyOpt, true, cl::parser<std::string> >
-   DebugOnly("debug-only", cl::desc("Enable a specific type of debug output"),
-             cl::Hidden, cl::value_desc("debug string"),
--            cl::location(DebugOnlyOptLoc), cl::ValueRequired);
-+            cl::location(DebugOnlyOptLoc), cl::ValueRequired, cl::ZeroOrMore);
- #endif
- }
- 
diff --git a/recipes/llvm/llvm2.6_2.6.bb b/recipes/llvm/llvm2.6_2.6.bb
deleted file mode 100644
index 35aa38fe76..0000000000
--- a/recipes/llvm/llvm2.6_2.6.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-require llvm.inc
-
-PR = "r1"
-
-DEPENDS = "llvm-common llvm2.6-native"
-
-SRC_URI += "\
-  file://fix-build.patch \
-  file://llvm-debugonly-zeroormore.patch;striplevel=0 \
-  file://BX_to_BLX.patch \
-"
-
-LLVM_RELEASE = "2.6"
-
-SRC_URI[md5sum] = "34a11e807add0f4555f691944e1a404a"
-SRC_URI[sha256sum] = "4cd9257350c5ff8b9b139d19497e2396c0604eef0e5d6504f5c1463b09bf2d84"
diff --git a/recipes/llvm/llvm2.7_2.7.bb b/recipes/llvm/llvm2.7_2.7.bb
index f74e45d130..2180c1be98 100644
--- a/recipes/llvm/llvm2.7_2.7.bb
+++ b/recipes/llvm/llvm2.7_2.7.bb
@@ -10,9 +10,9 @@ SRC_URI = "\
   "
 
 EXTRA_OECMAKE += "\
-        -DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \
-        -DLLVM_ENABLE_ASSERTIONS:BOOL=ON \
-        -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
+	-DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \
+	-DLLVM_ENABLE_ASSERTIONS:BOOL=ON \
+	-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
 	"