mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-08 05:29:22 +00:00
Code Issues Projects Releases Wiki Activity

llvm: use newer class-native overrides instead of virtclass

Browse Source 
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2013-07-06 17:11:00 +02:00
parent 1295dedccd
commit fc7eda558f
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-core/llvm/llvm-common.bb
+1 -1
View File
@@ -14,7 +14,7 @@ llvm_common_sysroot_preprocess() {
install -m 0755 ${WORKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/ install -m 0755 ${WORKDIR}/llvm-config ${SYSROOT_DESTDIR}${bindir_crossscripts}/
} }
do_install_virtclass-native() { do_install_class-native() {
install -d ${D}${bindir} install -d ${D}${bindir}
install -m 0755 ${WORKDIR}/llvm-config ${D}${bindir} install -m 0755 ${WORKDIR}/llvm-config ${D}${bindir}
} }
meta-oe/recipes-core/llvm/llvm2.inc
+5 -5
View File
@@ -1,5 +1,5 @@
DEPENDS = "llvm${LLVM_RELEASE}-native llvm-common" 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" SRC_URI = "http://llvm.org/releases/${PV}/llvm-${PV}.tgz"
S = "${WORKDIR}/llvm-${PV}" S = "${WORKDIR}/llvm-${PV}"
@@ -57,7 +57,7 @@ PACKAGES_DYNAMIC = "llvm-*"
# the difference to the non-native build is that we do not need # the difference to the non-native build is that we do not need
# to declare the location of the tblgen executable. # to declare the location of the tblgen executable.
EXTRA_OECMAKE_virtclass-native = "\ EXTRA_OECMAKE_class-native = "\
-DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \ -DLLVM_TARGETS_TO_BUILD=${LLVM_ARCH} \
-DCMAKE_LINKER:FILEPATH=${LD} \ -DCMAKE_LINKER:FILEPATH=${LD} \
-DCMAKE_AR:FILEPATH=${AR} \ -DCMAKE_AR:FILEPATH=${AR} \
@@ -68,9 +68,9 @@ EXTRA_OECMAKE_virtclass-native = "\
-DNM_PATH:FILEPATH=${NM} \ -DNM_PATH:FILEPATH=${NM} \
" "
PACKAGES_virtclass-native = "" PACKAGES_class-native = ""
PACKAGES_DYNAMIC_virtclass-native = "" PACKAGES_DYNAMIC_class-native = ""
python populate_packages_prepend () { python populate_packages_prepend () {
libllvm_libdir = bb.data.expand('${libdir}/${LLVM_DIR}', d) 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} 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. # Install into a private directory to be able to reorganize the files.
cd ${LLVM_BUILD_DIR} cd ${LLVM_BUILD_DIR}
oe_runmake DESTDIR=${LLVM_INSTALL_DIR} install oe_runmake DESTDIR=${LLVM_INSTALL_DIR} install