From 4954e3116ea24c825bccc9307b803b646bf70dfd Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Sun, 14 Feb 2016 12:47:12 +0100
Subject: llvm: move BugpointPasses.so and LLVMHello.so to separate packages

* keep them RRECOMMENDed from -dev
* fixes following QA error:
  NOTE: recipe llvm3.3-3.3-r0: task do_package_qa: Started
  ERROR: QA Issue:
    -dev package contains non-symlink .so: llvm3.3-dev path 'llvm3.3/3.3-r0/packages-split/llvm3.3-dev/usr/lib/llvm3.3/LLVMHello.so'
    -dev package contains non-symlink .so: llvm3.3-dev path 'llvm3.3/3.3-r0/packages-split/llvm3.3-dev/usr/lib/llvm3.3/BugpointPasses.so' [dev-elf]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-core/llvm/llvm.inc | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'meta-oe/recipes-core')

diff --git a/meta-oe/recipes-core/llvm/llvm.inc b/meta-oe/recipes-core/llvm/llvm.inc
index 04c87aabb3..31b2db4e76 100644
--- a/meta-oe/recipes-core/llvm/llvm.inc
+++ b/meta-oe/recipes-core/llvm/llvm.inc
@@ -116,20 +116,29 @@ llvm_sysroot_preprocess() {
     mv ${LLVM_INSTALL_DIR}/llvm-config-host ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV}
 }
 
+PACKAGES += "${PN}-bugpointpasses ${PN}-llvmhello"
 ALLOW_EMPTY_${PN} = "1"
 ALLOW_EMPTY_${PN}-staticdev = "1"
 FILES_${PN} = ""
 FILES_${PN}-staticdev = ""
-DOTDEBUG-dbg = " ${bindir}/${LLVM_DIR}/.debug \
-                 ${libdir}/${LLVM_DIR}/.debug/BugpointPasses.so \
-                 ${libdir}/${LLVM_DIR}/.debug/LLVMHello.so \
-                 /usr/src/debug \
+DOTDEBUG-dbg = " \
+    ${bindir}/${LLVM_DIR}/.debug \
+    ${libdir}/${LLVM_DIR}/.debug/BugpointPasses.so \
+    ${libdir}/${LLVM_DIR}/.debug/LLVMHello.so \
+    /usr/src/debug \
 "
 
-FILES_${PN}-dev = "${bindir}/${LLVM_DIR} \
-                   ${includedir}/${LLVM_DIR} \
-                   ${libdir}/${LLVM_DIR}/BugpointPasses.so \
-                   ${libdir}/${LLVM_DIR}/LLVMHello.so \
+FILES_${PN}-dev = " \
+    ${bindir}/${LLVM_DIR} \
+    ${includedir}/${LLVM_DIR} \
+"
+RRECOMMENDS_${PN}-dev += "${PN}-bugpointpasses ${PN}-llvmhello"
+
+FILES_${PN}-bugpointpasses = "\
+    ${libdir}/${LLVM_DIR}/BugpointPasses.so \
+"
+FILES_${PN}-llvmhello = "\
+    ${libdir}/${LLVM_DIR}/LLVMHello.so \
 "
 
 PACKAGES_DYNAMIC = "^libllvm${LLVM_RELEASE}-.*$"
-- 
cgit 1.2.3-korg