3 files changed, 11 insertions, 8 deletions
diff --git a/recipes/llvm/llvm-2.5/fix-build.patch b/recipes/llvm/llvm-2.5/fix-build.patch
index 000fd4aca5..527823c18c 100644
--- a/recipes/llvm/llvm-2.5/fix-build.patch
+++ b/recipes/llvm/llvm-2.5/fix-build.patch
@@ -1,7 +1,7 @@
 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-20 14:18:37.637615308 +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.")
  
@@ -10,8 +10,8 @@ Index: llvm-2.5/tools/llvm-config/CMakeLists.txt
 -  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}!' >> temp.sed
-+  COMMAND echo 's!@LLVM_CXXFLAGS@!${CMAKE_CXX_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
diff --git a/recipes/llvm/llvm_2.4.bb b/recipes/llvm/llvm_2.4.bb
index a66d1b376b..fef48f5343 100644
--- a/recipes/llvm/llvm_2.4.bb
+++ b/recipes/llvm/llvm_2.4.bb
@@ -6,6 +6,7 @@ SRC_URI = "\
 	http://llvm.org/releases/${PV}/llvm-${PV}.tar.gz \
 	file://fix-build.patch;patch=1 \
 	file://fix-static-initialization.patch;patch=1 \
+	file://fix-ldr_pre.patch;patch=1 \
 	"
 
 DEPENDS = "llvm-native"
diff --git a/recipes/llvm/llvm_2.5.bb b/recipes/llvm/llvm_2.5.bb
index c0ce3345b8..ece64422b5 100644
--- a/recipes/llvm/llvm_2.5.bb
+++ b/recipes/llvm/llvm_2.5.bb
@@ -1,7 +1,3 @@
-# TODO:
-# - packages examples
-# - fix staging (and probably llvm-config script)
-
 DESCRIPTION = "The Low Level Virtual Machine"
 HOMEPAGE = "http://llvm.org"
 LICENSE = "various"
@@ -11,6 +7,8 @@ SRC_URI = "\
   file://fix-build.patch;patch=1 \
 "
 
+PR = "r2"
+
 DEPENDS = "llvm-native"
 
 inherit cmake
@@ -30,7 +28,11 @@ EXTRA_OECMAKE = "\
 "
 
 do_stage() {
-  oe_runmake DESTDIR="${STAGE_TEMP}" install
+  oe_runmake DESTDIR="${STAGING_DIR_HOST}" install
+
+  install -d ${STAGING_INCDIR}/llvm
+	find include/llvm -name "*.h" -maxdepth 1 -exec \
+    install {} ${STAGING_INCDIR}/llvm \;
 
   install -d ${STAGING_BINDIR_CROSS}