diff options
-rw-r--r-- | meta/packages/llvm/llvm-native/fix_ldflags_export.patch | 26 | ||||
-rw-r--r-- | meta/packages/llvm/llvm-native_svn.bb | 4 |
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 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" |