Patchwork [meta-oe,3/4] llvm: use newer class-native overrides instead of virtclass

login
register
mail settings
Submitter Martin Jansa
Date July 6, 2013, 7:33 p.m.
Message ID <69caeb1598b6e50a8e48ccf9105fb3aa61a91067.1373139082.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/53227/
State Accepted, archived
Commit fc7eda558f058317789680d13149af63d86e372d
Headers show

Comments

Martin Jansa - July 6, 2013, 7:33 p.m.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-core/llvm/llvm-common.bb |  2 +-
 meta-oe/recipes-core/llvm/llvm2.inc      | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

Patch

diff --git a/meta-oe/recipes-core/llvm/llvm-common.bb b/meta-oe/recipes-core/llvm/llvm-common.bb
index 192919e..395ab01 100644
--- a/meta-oe/recipes-core/llvm/llvm-common.bb
+++ b/meta-oe/recipes-core/llvm/llvm-common.bb
@@ -14,7 +14,7 @@  llvm_common_sysroot_preprocess() {
     install -m 0755 ${WORKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/
 }
 
-do_install_virtclass-native() {
+do_install_class-native() {
     install -d ${D}${bindir}
     install -m 0755 ${WORKDIR}/llvm-config ${D}${bindir}
 }
diff --git a/meta-oe/recipes-core/llvm/llvm2.inc b/meta-oe/recipes-core/llvm/llvm2.inc
index 5ae993a..b239d30 100644
--- a/meta-oe/recipes-core/llvm/llvm2.inc
+++ b/meta-oe/recipes-core/llvm/llvm2.inc
@@ -1,5 +1,5 @@ 
 DEPENDS = "llvm${LLVM_RELEASE}-native llvm-common"
-DEPENDS_virtclass-native = "llvm-common-native cmake-native"
+DEPENDS_class-native = "llvm-common-native cmake-native"
 
 SRC_URI = "http://llvm.org/releases/${PV}/llvm-${PV}.tgz"
 S = "${WORKDIR}/llvm-${PV}"
@@ -57,7 +57,7 @@  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_virtclass-native = "\
+EXTRA_OECMAKE_class-native = "\
     -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \
     -DCMAKE_LINKER:FILEPATH=${LD} \
     -DCMAKE_AR:FILEPATH=${AR} \
@@ -68,9 +68,9 @@  EXTRA_OECMAKE_virtclass-native = "\
     -DNM_PATH:FILEPATH=${NM} \
 "
 
-PACKAGES_virtclass-native = ""
+PACKAGES_class-native = ""
 
-PACKAGES_DYNAMIC_virtclass-native = ""
+PACKAGES_DYNAMIC_class-native = ""
 
 python populate_packages_prepend () {
     libllvm_libdir = bb.data.expand('${libdir}/${LLVM_DIR}', d)
@@ -130,7 +130,7 @@  llvm_sysroot_preprocess() {
         install -m 0755 bin/llvm-config${LLVM_RELEASE} ${SYSROOT_DESTDIR}${bindir_crossscripts}
 }
 
-do_install_virtclass-native() {
+do_install_class-native() {
     # Install into a private directory to be able to reorganize the files.
     cd ${LLVM_BUILD_DIR}
     oe_runmake DESTDIR=${LLVM_INSTALL_DIR} install