summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-04-11 16:16:50 +0000
committerRichard Purdie <richard@openedhand.com>2008-04-11 16:16:50 +0000
commit4f2380b30fc4ce9b7ef3e67bd4ce4c0ca51b7952 (patch)
tree39e66c9ad8787aea445d2d32d4becbe967ad4652
parentef949a67c4a7fc08775275227f07dc98e239c786 (diff)
downloadpoky-4f2380b30fc4ce9b7ef3e67bd4ce4c0ca51b7952.tar.gz
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
-rw-r--r--meta/packages/llvm/llvm-native/fix_ldflags_export.patch26
-rw-r--r--meta/packages/llvm/llvm-native_svn.bb4
2 files changed, 29 insertions, 1 deletions
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 0000000000..77511d68f6
--- /dev/null
+++ b/meta/packages/llvm/llvm-native/fix_ldflags_export.patch
@@ -0,0 +1,26 @@
1Index: trunk/tools/llvm-config/Makefile
2===================================================================
3--- trunk.orig/tools/llvm-config/Makefile 2008-02-11 15:14:22.000000000 +0000
4+++ trunk/tools/llvm-config/Makefile 2008-04-11 16:58:06.000000000 +0100
5@@ -27,7 +27,7 @@
6 # This is blank for now. We need to be careful about adding stuff here:
7 # LDFLAGS tend not to be portable, and we don't currently require the
8 # user to use libtool when linking against LLVM.
9-SUB_LDFLAGS =
10+SUB_LDFLAGS = ${LD.Flags}
11
12 FinalLibDeps = $(PROJ_OBJ_DIR)/FinalLibDeps.txt
13 LibDeps = $(PROJ_OBJ_DIR)/LibDeps.txt
14@@ -57,10 +57,11 @@
15 # Build our final script.
16 $(ToolDir)/llvm-config: llvm-config.in $(FinalLibDeps)
17 $(Echo) "Building llvm-config script."
18+ $(Echo) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),'
19 $(Verb) $(ECHO) 's,@LLVM_CPPFLAGS@,$(SUB_CPPFLAGS),' > temp.sed
20 $(Verb) $(ECHO) 's,@LLVM_CFLAGS@,$(SUB_CFLAGS),' >> temp.sed
21 $(Verb) $(ECHO) 's,@LLVM_CXXFLAGS@,$(SUB_CXXFLAGS),' >> temp.sed
22- $(Verb) $(ECHO) 's,@LLVM_LDFLAGS@,$(SUB_LDFLAGS),' >> temp.sed
23+ $(Verb) $(ECHO) 's#@LLVM_LDFLAGS@#$(SUB_LDFLAGS)#' >> temp.sed
24 $(Verb) $(ECHO) 's,@LLVM_BUILDMODE@,$(BuildMode),' >> temp.sed
25 $(Verb) $(SED) -f temp.sed < $< > $@
26 $(Verb) $(RM) temp.sed
diff --git a/meta/packages/llvm/llvm-native_svn.bb b/meta/packages/llvm/llvm-native_svn.bb
index 83ec69ee80..56cc0d97b7 100644
--- a/meta/packages/llvm/llvm-native_svn.bb
+++ b/meta/packages/llvm/llvm-native_svn.bb
@@ -1,7 +1,9 @@
1DEPENDS = "flex-native" 1DEPENDS = "flex-native"
2SRC_URI = "svn://llvm.org/svn/llvm-project/llvm;proto=http;module=trunk" 2SRC_URI = "svn://llvm.org/svn/llvm-project/llvm;proto=http;module=trunk \
3 file://fix_ldflags_export.patch;patch=1"
3 4
4PV = "0.0+${SRCREV}" 5PV = "0.0+${SRCREV}"
6PR = "r1"
5 7
6S = "${WORKDIR}/trunk" 8S = "${WORKDIR}/trunk"
7 9