From 4f2380b30fc4ce9b7ef3e67bd4ce4c0ca51b7952 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 11 Apr 2008 16:16:50 +0000
Subject: llvm-native: Export the LDFLAGS, we do need them regardless of what
 the llvm devs think

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4241 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../llvm/llvm-native/fix_ldflags_export.patch      | 26 ++++++++++++++++++++++
 meta/packages/llvm/llvm-native_svn.bb              |  4 +++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 meta/packages/llvm/llvm-native/fix_ldflags_export.patch

(limited to 'meta')

diff --git a/meta/packages/llvm/llvm-native/fix_ldflags_export.patch b/meta/packages/llvm/llvm-native/fix_ldflags_export.patch
new file mode 100644
index 000000000..77511d68f
--- /dev/null
+++ b/meta/packages/llvm/llvm-native/fix_ldflags_export.patch
@@ -0,0 +1,26 @@
+Index: trunk/tools/llvm-config/Makefile
+===================================================================
+--- trunk.orig/tools/llvm-config/Makefile	2008-02-11 15:14:22.000000000 +0000
++++ trunk/tools/llvm-config/Makefile	2008-04-11 16:58:06.000000000 +0100
+@@ -27,7 +27,7 @@
+ # This is blank for now.  We need to be careful about adding stuff here:
+ # LDFLAGS tend not to be portable, and we don't currently require the
+ # user to use libtool when linking against LLVM.
+-SUB_LDFLAGS = 
++SUB_LDFLAGS = ${LD.Flags}
+ 
+ FinalLibDeps = $(PROJ_OBJ_DIR)/FinalLibDeps.txt
+ LibDeps      = $(PROJ_OBJ_DIR)/LibDeps.txt
+@@ -57,10 +57,11 @@
+ # Build our final script.
+ $(ToolDir)/llvm-config: llvm-config.in $(FinalLibDeps)
+ 	$(Echo) "Building llvm-config script."
++	$(Echo) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),'
+ 	$(Verb) $(ECHO) 's,@LLVM_CPPFLAGS@,$(SUB_CPPFLAGS),' > temp.sed
+ 	$(Verb) $(ECHO) 's,@LLVM_CFLAGS@,$(SUB_CFLAGS),' >> temp.sed
+ 	$(Verb) $(ECHO) 's,@LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' >> temp.sed
+-	$(Verb) $(ECHO) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),' >> temp.sed
++	$(Verb) $(ECHO) 's#@LLVM_LDFLAGS@#$(SUB_LDFLAGS)#' >> temp.sed
+ 	$(Verb) $(ECHO) 's,@LLVM_BUILDMODE@,$(BuildMode),' >> temp.sed
+ 	$(Verb) $(SED) -f temp.sed < $< > $@
+ 	$(Verb) $(RM) temp.sed
diff --git a/meta/packages/llvm/llvm-native_svn.bb b/meta/packages/llvm/llvm-native_svn.bb
index 83ec69ee8..56cc0d97b 100644
--- a/meta/packages/llvm/llvm-native_svn.bb
+++ b/meta/packages/llvm/llvm-native_svn.bb
@@ -1,7 +1,9 @@
 DEPENDS = "flex-native"
-SRC_URI = "svn://llvm.org/svn/llvm-project/llvm;proto=http;module=trunk"
+SRC_URI = "svn://llvm.org/svn/llvm-project/llvm;proto=http;module=trunk \
+           file://fix_ldflags_export.patch;patch=1"
 
 PV = "0.0+${SRCREV}"
+PR = "r1"
 
 S = "${WORKDIR}/trunk"
 
-- 
cgit v1.2.3