From 5356193d0f64dfdb0b9fb500357a183a6f2c2316 Mon Sep 17 00:00:00 2001
From: Robert Schuster <robertschuster@fsfe.org>
Date: Fri, 11 Jun 2010 13:20:00 +0200
Subject: llvm.inc: fixed typo. llvm2.7 2.7: Build with shared library, added
 patch to work around not correctly linking libgcc.

---
 recipes/llvm/llvm.inc           |  2 +-
 recipes/llvm/llvm2.7/link.patch | 12 ++++++++++++
 recipes/llvm/llvm2.7_2.7.bb     |  4 +++-
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 recipes/llvm/llvm2.7/link.patch

(limited to 'recipes/llvm')

diff --git a/recipes/llvm/llvm.inc b/recipes/llvm/llvm.inc
index 3c22318e33..3e11318743 100644
--- a/recipes/llvm/llvm.inc
+++ b/recipes/llvm/llvm.inc
@@ -13,7 +13,7 @@
 # fixed (report bug).
 #
 # However the *recipe* for your program/library *must* declare
-# export WANT_LLVM_RELEASE = "<valid version number>
+# export WANT_LLVM_RELEASE = "<valid version number>"
 # The version number is picked up by a generic wrapper script which just calls
 # the variant of the specified version.
 
diff --git a/recipes/llvm/llvm2.7/link.patch b/recipes/llvm/llvm2.7/link.patch
new file mode 100644
index 0000000000..059bd92295
--- /dev/null
+++ b/recipes/llvm/llvm2.7/link.patch
@@ -0,0 +1,12 @@
+Index: llvm-2.7/tools/llvm-shlib/Makefile
+===================================================================
+--- llvm-2.7/tools/llvm-shlib/Makefile (revision 103711)
++++ llvm-2.7/tools/llvm-shlib/Makefile (working copy)
+@@ -56,5 +56,5 @@
+     LLVMLibsOptions := -Wl,--whole-archive $(LLVMLibsOptions) 
+                        -Wl,--no-whole-archive
+     # Don't allow unresolved symbols.
+-    LLVMLibsOptions += -Wl,--no-undefined
++    LLVMLibsOptions += -lgcc -Wl,--no-undefined
+ endif
+
diff --git a/recipes/llvm/llvm2.7_2.7.bb b/recipes/llvm/llvm2.7_2.7.bb
index b72581c7e3..623f6fa4b8 100644
--- a/recipes/llvm/llvm2.7_2.7.bb
+++ b/recipes/llvm/llvm2.7_2.7.bb
@@ -1,17 +1,19 @@
 require llvm.inc
 
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "llvm-common llvm2.7-native"
 
 SRC_URI = "\
   http://llvm.org/releases/${PV}/llvm-${PV}.tgz \
   file://BX_to_BLX.patch \
+  file://link.patch \
   "
 
 EXTRA_OECMAKE += "\
         -DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \
         -DLLVM_ENABLE_ASSERTIONS:BOOL=ON \
+		-DBUILD_SHARED_LIBS:BOOL=ON \
         -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \
 	"
 
-- 
cgit 1.2.3-korg