diff options
-rw-r--r-- | meta-oe/recipes-core/llvm/llvm.inc | 30 | ||||
-rw-r--r-- | meta-oe/recipes-core/llvm/llvm2.inc | 14 | ||||
-rw-r--r-- | meta-oe/recipes-core/llvm/llvm3.inc | 4 |
3 files changed, 26 insertions, 22 deletions
diff --git a/meta-oe/recipes-core/llvm/llvm.inc b/meta-oe/recipes-core/llvm/llvm.inc index 20588f3f3f..c0d6b6ef10 100644 --- a/meta-oe/recipes-core/llvm/llvm.inc +++ b/meta-oe/recipes-core/llvm/llvm.inc @@ -32,11 +32,33 @@ inherit perlnative pythonnative LLVM_RELEASE = "${PV}" LLVM_DIR = "llvm${LLVM_RELEASE}" -FILES_${PN}-dbg += "${bindir}/${LLVM_DIR}/.debug \ - ${libdir}/${LLVM_DIR}/.debug \ +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 \ " -FILES_${PN}-dev += "${bindir} \ + +FILES_${PN}-dev += "${bindir}/${LLVM_DIR} \ ${libdir}/${LLVM_DIR}/BugpointPasses.so \ ${libdir}/${LLVM_DIR}/LLVMHello.so \ " -FILES_${PN}-staticdev = "${libdir}/${LLVM_DIR}/*.a" + +PACKAGES_DYNAMIC = "^libllvm-.*$" + +python llvm_populate_packages() { + libllvm_libdir = bb.data.expand('${libdir}/${LLVM_DIR}', d) + split_packages = do_split_packages(d, libllvm_libdir, '^lib(.*)\.so$', 'libllvm${LLVM_RELEASE}-%s', 'Split package for %s', allow_dirs=True) + split_dbg_packages = do_split_packages(d, libllvm_libdir+'/.debug', '^lib(.*)\.so$', 'libllvm${LLVM_RELEASE}-%s-dbg', 'Split debug package for %s', allow_dirs=True) + split_staticdev_packages = do_split_packages(d, libllvm_libdir, '^lib(.*)\.a$', 'libllvm${LLVM_RELEASE}-%s-staticdev', 'Split staticdev package for %s', allow_dirs=True) + if split_packages: + pn = d.getVar('PN', True) + d.appendVar('RDEPENDS_' + pn, ' '+' '.join(split_packages)) + d.appendVar('RDEPENDS_' + pn + '-dbg', ' '+' '.join(split_dbg_packages)) + d.appendVar('RDEPENDS_' + pn + '-staticdev', ' '+' '.join(split_staticdev_packages)) +} + +PACKAGESPLITFUNCS_prepend = "llvm_populate_packages " diff --git a/meta-oe/recipes-core/llvm/llvm2.inc b/meta-oe/recipes-core/llvm/llvm2.inc index b239d30f44..8765a7606e 100644 --- a/meta-oe/recipes-core/llvm/llvm2.inc +++ b/meta-oe/recipes-core/llvm/llvm2.inc @@ -53,8 +53,6 @@ EXTRA_OECMAKE = "\ # We need to reset this to avoid breakage as we build out of tree TOOLCHAIN_OPTIONS = "" -PACKAGES_DYNAMIC = "llvm-*" - # the difference to the non-native build is that we do not need # to declare the location of the tblgen executable. EXTRA_OECMAKE_class-native = "\ @@ -68,18 +66,6 @@ EXTRA_OECMAKE_class-native = "\ -DNM_PATH:FILEPATH=${NM} \ " -PACKAGES_class-native = "" - -PACKAGES_DYNAMIC_class-native = "" - -python populate_packages_prepend () { - libllvm_libdir = bb.data.expand('${libdir}/${LLVM_DIR}', d) - do_split_packages(d, libllvm_libdir, '^lib(.*)\.so$', 'libllvm-%s', 'Split package for %s', allow_dirs=True) -} - -FILES_${PN} = "" -ALLOW_EMPTY_${PN} = "1" - base_do_compile_prepend() { # Avoid *** No rule to make target `native/bin/tblgen', needed by `include/llvm/Intrinsics.gen.tmp' oe_runmake tblgen diff --git a/meta-oe/recipes-core/llvm/llvm3.inc b/meta-oe/recipes-core/llvm/llvm3.inc index b04fe24fd5..798d4a2458 100644 --- a/meta-oe/recipes-core/llvm/llvm3.inc +++ b/meta-oe/recipes-core/llvm/llvm3.inc @@ -18,10 +18,6 @@ EXTRA_OECONF += "--disable-assertions \ --enable-shared \ --enable-targets=host-only" EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1" -FILES_${PN} = "${libdir}/lib*.so \ - ${libdir}/${LLVM_DIR}/*" -FILES_SOLIBSDEV = "" -INSANE_SKIP_${PN} = "dev-so" do_configure_prepend() { # Remove RPATHs |