diff options
Diffstat (limited to 'meta-oe/recipes-core/llvm')
-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 20588f3f3..c0d6b6ef1 100644 --- a/meta-oe/recipes-core/llvm/llvm.inc +++ b/meta-oe/recipes-core/llvm/llvm.inc | |||
@@ -32,11 +32,33 @@ inherit perlnative pythonnative | |||
32 | LLVM_RELEASE = "${PV}" | 32 | LLVM_RELEASE = "${PV}" |
33 | LLVM_DIR = "llvm${LLVM_RELEASE}" | 33 | LLVM_DIR = "llvm${LLVM_RELEASE}" |
34 | 34 | ||
35 | FILES_${PN}-dbg += "${bindir}/${LLVM_DIR}/.debug \ | 35 | ALLOW_EMPTY_${PN} = "1" |
36 | ${libdir}/${LLVM_DIR}/.debug \ | 36 | ALLOW_EMPTY_${PN}-staticdev = "1" |
37 | FILES_${PN} = "" | ||
38 | FILES_${PN}-staticdev = "" | ||
39 | DOTDEBUG-dbg = " ${bindir}/${LLVM_DIR}/.debug \ | ||
40 | ${libdir}/${LLVM_DIR}/.debug/BugpointPasses.so \ | ||
41 | ${libdir}/${LLVM_DIR}/.debug/LLVMHello.so \ | ||
42 | /usr/src/debug \ | ||
37 | " | 43 | " |
38 | FILES_${PN}-dev += "${bindir} \ | 44 | |
45 | FILES_${PN}-dev += "${bindir}/${LLVM_DIR} \ | ||
39 | ${libdir}/${LLVM_DIR}/BugpointPasses.so \ | 46 | ${libdir}/${LLVM_DIR}/BugpointPasses.so \ |
40 | ${libdir}/${LLVM_DIR}/LLVMHello.so \ | 47 | ${libdir}/${LLVM_DIR}/LLVMHello.so \ |
41 | " | 48 | " |
42 | FILES_${PN}-staticdev = "${libdir}/${LLVM_DIR}/*.a" | 49 | |
50 | PACKAGES_DYNAMIC = "^libllvm-.*$" | ||
51 | |||
52 | python llvm_populate_packages() { | ||
53 | libllvm_libdir = bb.data.expand('${libdir}/${LLVM_DIR}', d) | ||
54 | split_packages = do_split_packages(d, libllvm_libdir, '^lib(.*)\.so$', 'libllvm${LLVM_RELEASE}-%s', 'Split package for %s', allow_dirs=True) | ||
55 | 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) | ||
56 | split_staticdev_packages = do_split_packages(d, libllvm_libdir, '^lib(.*)\.a$', 'libllvm${LLVM_RELEASE}-%s-staticdev', 'Split staticdev package for %s', allow_dirs=True) | ||
57 | if split_packages: | ||
58 | pn = d.getVar('PN', True) | ||
59 | d.appendVar('RDEPENDS_' + pn, ' '+' '.join(split_packages)) | ||
60 | d.appendVar('RDEPENDS_' + pn + '-dbg', ' '+' '.join(split_dbg_packages)) | ||
61 | d.appendVar('RDEPENDS_' + pn + '-staticdev', ' '+' '.join(split_staticdev_packages)) | ||
62 | } | ||
63 | |||
64 | PACKAGESPLITFUNCS_prepend = "llvm_populate_packages " | ||
diff --git a/meta-oe/recipes-core/llvm/llvm2.inc b/meta-oe/recipes-core/llvm/llvm2.inc index b239d30f4..8765a7606 100644 --- a/meta-oe/recipes-core/llvm/llvm2.inc +++ b/meta-oe/recipes-core/llvm/llvm2.inc | |||
@@ -53,8 +53,6 @@ EXTRA_OECMAKE = "\ | |||
53 | # We need to reset this to avoid breakage as we build out of tree | 53 | # We need to reset this to avoid breakage as we build out of tree |
54 | TOOLCHAIN_OPTIONS = "" | 54 | TOOLCHAIN_OPTIONS = "" |
55 | 55 | ||
56 | PACKAGES_DYNAMIC = "llvm-*" | ||
57 | |||
58 | # the difference to the non-native build is that we do not need | 56 | # the difference to the non-native build is that we do not need |
59 | # to declare the location of the tblgen executable. | 57 | # to declare the location of the tblgen executable. |
60 | EXTRA_OECMAKE_class-native = "\ | 58 | EXTRA_OECMAKE_class-native = "\ |
@@ -68,18 +66,6 @@ EXTRA_OECMAKE_class-native = "\ | |||
68 | -DNM_PATH:FILEPATH=${NM} \ | 66 | -DNM_PATH:FILEPATH=${NM} \ |
69 | " | 67 | " |
70 | 68 | ||
71 | PACKAGES_class-native = "" | ||
72 | |||
73 | PACKAGES_DYNAMIC_class-native = "" | ||
74 | |||
75 | python populate_packages_prepend () { | ||
76 | libllvm_libdir = bb.data.expand('${libdir}/${LLVM_DIR}', d) | ||
77 | do_split_packages(d, libllvm_libdir, '^lib(.*)\.so$', 'libllvm-%s', 'Split package for %s', allow_dirs=True) | ||
78 | } | ||
79 | |||
80 | FILES_${PN} = "" | ||
81 | ALLOW_EMPTY_${PN} = "1" | ||
82 | |||
83 | base_do_compile_prepend() { | 69 | base_do_compile_prepend() { |
84 | # Avoid *** No rule to make target `native/bin/tblgen', needed by `include/llvm/Intrinsics.gen.tmp' | 70 | # Avoid *** No rule to make target `native/bin/tblgen', needed by `include/llvm/Intrinsics.gen.tmp' |
85 | oe_runmake tblgen | 71 | oe_runmake tblgen |
diff --git a/meta-oe/recipes-core/llvm/llvm3.inc b/meta-oe/recipes-core/llvm/llvm3.inc index b04fe24fd..798d4a245 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 \ | |||
18 | --enable-shared \ | 18 | --enable-shared \ |
19 | --enable-targets=host-only" | 19 | --enable-targets=host-only" |
20 | EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1" | 20 | EXTRA_OEMAKE += "REQUIRES_RTTI=1 VERBOSE=1" |
21 | FILES_${PN} = "${libdir}/lib*.so \ | ||
22 | ${libdir}/${LLVM_DIR}/*" | ||
23 | FILES_SOLIBSDEV = "" | ||
24 | INSANE_SKIP_${PN} = "dev-so" | ||
25 | 21 | ||
26 | do_configure_prepend() { | 22 | do_configure_prepend() { |
27 | # Remove RPATHs | 23 | # Remove RPATHs |