[oe-commits] Khem Raj : llvm3: Fix build when S != B

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: c12c549e7af593d6d3ed491eefc2f12d66a8c92c
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c12c549e7af593d6d3ed491eefc2f12d66a8c92c

Author: Khem Raj <raj.khem at gmail.com>
Date:   Tue Apr 29 14:16:33 2014 -0700

llvm3: Fix build when S != B

Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-oe/recipes-core/llvm/llvm3.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta-oe/recipes-core/llvm/llvm3.inc b/meta-oe/recipes-core/llvm/llvm3.inc
index 798d4a2..a5bd896 100644
--- a/meta-oe/recipes-core/llvm/llvm3.inc
+++ b/meta-oe/recipes-core/llvm/llvm3.inc
@@ -21,14 +21,14 @@ EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1"
 
 do_configure_prepend() {
     # Remove RPATHs
-    sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
+    sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' ${S}/Makefile.rules
 
     # Drop "svn" suffix from version string
-    sed -i 's/${PV}svn/${PV}/g' configure
+    sed -i 's/${PV}svn/${PV}/g' ${S}/configure
 
     # Fix paths in llvm-config
-    sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" tools/llvm-config/llvm-config.cpp
-    sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" tools/llvm-config/llvm-config.cpp
+    sed -i "s|sys::path::parent_path(CurrentPath))\.str()|sys::path::parent_path(sys::path::parent_path(CurrentPath))).str()|g" ${S}/tools/llvm-config/llvm-config.cpp
+    sed -ri "s#/(bin|include|lib)(/?\")#/\1/${LLVM_DIR}\2#g" ${S}/tools/llvm-config/llvm-config.cpp
 
     # Fails to build unless using separate directory from source
     mkdir -p ${LLVM_BUILD_DIR}