[oe-commits] Robert Schuster : llvm 2.5: Updated patch to include preprocessor definitions.

[GIT User account]

Module: openembedded.git
Branch: kergoth/master
Commit: 5575ee4e7a2b2313ae856c93327199600ff5803a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5575ee4e7a2b2313ae856c93327199600ff5803a

Author: Robert Schuster <thebohemian at gmx.net>
Date:   Wed Mar 25 11:16:35 2009 +0100

llvm 2.5: Updated patch to include preprocessor definitions.

---

 recipes/llvm/llvm-2.5/fix-build.patch |    6 +++---
 recipes/llvm/llvm_2.4.bb              |    1 +
 recipes/llvm/llvm_2.5.bb              |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes/llvm/llvm-2.5/fix-build.patch b/recipes/llvm/llvm-2.5/fix-build.patch
index 9430ad3..527823c 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-23 12:49:10.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.")
  
@@ -10,8 +10,8 @@ Index: llvm-2.5/tools/llvm-config/CMakeLists.txt
 -  COMMAND echo 's, at LLVM_CFLAGS@,${CMAKE_C_FLAGS},' >> temp.sed
 -  COMMAND echo 's, at 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!' >> temp.sed
-+  COMMAND echo 's!@LLVM_CXXFLAGS@!${CMAKE_CXX_FLAGS} -D_GNU_SOURCE -D__STDC_LIMIT_MACROS!' >> 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, at LLVM_LDFLAGS@,${CMAKE_SHARED_LINKER_FLAGS},' >> temp.sed
 -  COMMAND echo 's, at LIBS@,,' >> temp.sed                    # TODO: System libs
diff --git a/recipes/llvm/llvm_2.4.bb b/recipes/llvm/llvm_2.4.bb
index a66d1b3..fef48f5 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 d8a8d18..ece6442 100644
--- a/recipes/llvm/llvm_2.5.bb
+++ b/recipes/llvm/llvm_2.5.bb
@@ -7,7 +7,7 @@ SRC_URI = "\
   file://fix-build.patch;patch=1 \
 "
 
-PR = "r1"
+PR = "r2"
 
 DEPENDS = "llvm-native"