aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@gmx.net>2009-03-23 13:08:22 +0100
committerRobert Schuster <thebohemian@gmx.net>2009-03-23 13:08:22 +0100
commit036b1362f3b84d565fe449ba822fa304abbdd110 (patch)
treeec26521a76836680e0b40ea9e1d083f32dab79c2
parente2b99b79f516a7466dc050902cee62f39869bf9d (diff)
downloadopenembedded-036b1362f3b84d565fe449ba822fa304abbdd110.tar.gz
openembedded-036b1362f3b84d565fe449ba822fa304abbdd110.tar.bz2
openembedded-036b1362f3b84d565fe449ba822fa304abbdd110.zip
llvm 2.5: Fixes
- updated patch to include important preprocessor definitions - copy missing header into staging manually
-rw-r--r--recipes/llvm/llvm-2.5/fix-build.patch6
-rw-r--r--recipes/llvm/llvm_2.5.bb12
2 files changed, 10 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..9430ad3cb8 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 12:49:10.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!' >> temp.sed
++ COMMAND echo 's!@LLVM_CXXFLAGS@!${CMAKE_CXX_FLAGS} -D_GNU_SOURCE -D__STDC_LIMIT_MACROS!' >> 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.5.bb b/recipes/llvm/llvm_2.5.bb
index c0ce3345b8..d8a8d1893b 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 = "r1"
+
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}