Patchwork [meta-java/openjdk-7.0,3/7] llvm2.8: Fix build break discovred by unanchored regexp fix in bitbake

login
register
mail settings
Submitter Khem Raj
Date Aug. 21, 2012, 4:03 a.m.
Message ID <1345521816-2364-3-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/35035/
State Accepted, archived
Headers show

Comments

Khem Raj - Aug. 21, 2012, 4:03 a.m.
commit 23bd5300b4a99218a15f4f6b0ab4091d63a602a5 fixed a bug
in bitbake which exposed this latent problem where we were using

EXTRA_OECMAKE_append-arm it was being treated as
EXTRA_OECMAKE_append before the above mentioned fix and hence
all was fine but after this fix behavior changed and
it was just EXTRA_OECMAKE_append-arm and was causing build
breaks

| ../../lib/libLLVMTransformUtils.so: undefined reference to
`llvm::CallGraphNode::removeCallEdgeFor(llvm::CallSite)'
| ../../lib/libLLVMTransformUtils.so: undefined reference to
`llvm::CallGraph::getOrInsertFunction(llvm::Function const*)'
| ../../lib/libLLVMTransformUtils.so: undefined reference to
`llvm::CallGraphLinkVar'
| ../../lib/libLLVMScalarOpts.so: undefined reference to
`llvm::createInstructionCombiningPass()'
| collect2: error: ld returned 1 exit status
| make[2]: *** [bin/llc] Error 1
| make[2]: Leaving directory
`/work/yocto/poky/build/tmp/work/x86_64-poky-linux/llvm2.8-2.8-r2.1/llvm-2.8/build'
| make[1]: *** [tools/llc/CMakeFiles/llc.dir/all] Error 2
| make[1]: *** Waiting for unfinished jobs....

It also fixes the llvm-mc build for arm architecture

Signed-off-by: Khem Raj <raj.khem@gmail.com>

Conflicts:

	recipes-core/llvm/llvm2.8_2.8.bb
---
 recipes-core/llvm/llvm2.8/llvm-mc_disable.patch |   12 ------------
 recipes-core/llvm/llvm2.8_2.8.bb                |    6 ++----
 2 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 recipes-core/llvm/llvm2.8/llvm-mc_disable.patch

Patch

diff --git a/recipes-core/llvm/llvm2.8/llvm-mc_disable.patch b/recipes-core/llvm/llvm2.8/llvm-mc_disable.patch
deleted file mode 100644
index fddc674..0000000
--- a/recipes-core/llvm/llvm2.8/llvm-mc_disable.patch
+++ /dev/null
@@ -1,12 +0,0 @@ 
-Index: llvm-2.8/tools/CMakeLists.txt
-===================================================================
---- llvm-2.8.orig/tools/CMakeLists.txt	2010-08-24 11:16:51.000000000 +0200
-+++ llvm-2.8/tools/CMakeLists.txt	2011-12-21 16:47:47.718508763 +0100
-@@ -14,7 +14,6 @@
- add_subdirectory(opt)
- add_subdirectory(llvm-as)
- add_subdirectory(llvm-dis)
--add_subdirectory(llvm-mc)
- 
- add_subdirectory(llc)
- add_subdirectory(llvm-ranlib)
diff --git a/recipes-core/llvm/llvm2.8_2.8.bb b/recipes-core/llvm/llvm2.8_2.8.bb
index 3459885..72ef29a 100644
--- a/recipes-core/llvm/llvm2.8_2.8.bb
+++ b/recipes-core/llvm/llvm2.8_2.8.bb
@@ -4,7 +4,7 @@  require llvm.inc
 LICENSE = "NCSA"
 LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=0ac5f799a2d89477c75b0a378b221855"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += " \
             file://30may-llvm2.8-pr399-ppc-arm.patch \
@@ -12,11 +12,9 @@  SRC_URI += " \
             file://add-unistd.patch \
            "
 
-SRC_URI_append_arm = " file://llvm-mc_disable.patch "
-
 LLVM_RELEASE = "2.8"
 
-EXTRA_OECMAKE_append-arm = " -DBUILD_SHARED_LIBS:BOOL=OFF "
+EXTRA_OECMAKE += " -DBUILD_SHARED_LIBS:BOOL=OFF "
 
 SRC_URI[md5sum] = "220d361b4d17051ff4bb21c64abe05ba"
 SRC_URI[sha256sum] = "25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b"