New recipes by Xerxes Ranby (xerxes@zafena.se)

llvm2.6 2.5+svnr20090409: New recipe.
llvm2.6-native 2.5+svnr20090409: New recipe.
llvm-native.inc: Depend on cmake-native.

diff --git a/recipes/llvm/llvm-native.inc b/recipes/llvm/llvm-native.inc
index a7d7fa3..ab1ce56 100644 (file)
--- a/recipes/llvm/llvm-native.inc
+++ b/recipes/llvm/llvm-native.inc
@@ -1,6 +1,6 @@
 require llvm.inc
 
-DEPENDS = "llvm-common-native"
+DEPENDS = "llvm-common-native cmake-native"
 
 inherit native
 

diff --git a/recipes/llvm/llvm2.6-native_2.5+svnr20090409.bb b/recipes/llvm/llvm2.6-native_2.5+svnr20090409.bb
new file mode 100644 (file)
index 0000000..6d50e00
--- /dev/null
+++ b/recipes/llvm/llvm2.6-native_2.5+svnr20090409.bb
@@ -0,0 +1,13 @@
+require llvm-native.inc
+
+SRCREV = "68706"
+
+PV = "2.5+svnr${SRCREV}"
+
+PR = "r1"
+
+SRC_URI = "svn://llvm.org/svn/llvm-project/llvm/;proto=http;module=trunk \
+           file://fix-build.patch;patch=1"
+
+S = "${WORKDIR}/trunk"
+

diff --git a/recipes/llvm/llvm2.6/fix-build.patch b/recipes/llvm/llvm2.6/fix-build.patch
index 5539656..fe7a8e4 100644 (file)
--- a/recipes/llvm/llvm2.6/fix-build.patch
+++ b/recipes/llvm/llvm2.6/fix-build.patch
@@ -1,13 +1,24 @@
+<<<<<<< HEAD:recipes/llvm/llvm2.6/fix-build.patch
 Index: tools/llvm-config/CMakeLists.txt
 ===================================================================
 --- a/tools.orig/llvm-config/CMakeLists.txt    2009-04-09 10:45:01.000000000 +0200
 +++ b/tools/llvm-config/CMakeLists.txt 2009-04-09 10:43:52.000000000 +0200
+=======
+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
+>>>>>>> New recipes by Xerxes Ranby (xerxes@zafena.se):recipes/llvm/llvm2.6/fix-build.patch
 @@ -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
+<<<<<<< HEAD:recipes/llvm/llvm2.6/fix-build.patch
 +  COMMAND echo 's!@LLVM_CXXFLAGS@!${CXX_FLGS} -fpermissive -fvisibility-inlines-hidden!' >> temp.sed
+=======
++  COMMAND echo 's!@LLVM_CXXFLAGS@!${CXX_FLGS} -fpermissive -fvisibility-inlines-hidden -Woverloaded-virtual!' >> temp.sed
+>>>>>>> New recipes by Xerxes Ranby (xerxes@zafena.se):recipes/llvm/llvm2.6/fix-build.patch
    # 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_2.5+svnr20090409.bb b/recipes/llvm/llvm2.6_2.5+svnr20090409.bb
new file mode 100644 (file)
index 0000000..8e21935
--- /dev/null
+++ b/recipes/llvm/llvm2.6_2.5+svnr20090409.bb
@@ -0,0 +1,16 @@
+require llvm.inc
+
+SRCREV = "68706"
+
+PV = "2.5+svnr${SRCREV}"
+
+PR = "r1"
+
+DEPENDS = "llvm-common llvm2.6-native"
+
+SRC_URI = "svn://llvm.org/svn/llvm-project/llvm/;proto=http;module=trunk \
+          file://fix-build.patch;patch=1"
+
+S = "${WORKDIR}/trunk"
+
+