Patchwork [meta-oe] llvm3.2: replace LLVM_RELEASE with PV

login
register
mail settings
Submitter Jonathan Liu
Date June 13, 2013, 12:31 p.m.
Message ID <1371126705-15849-1-git-send-email-net147@gmail.com>
Download mbox | patch
Permalink /patch/51681/
State Accepted, archived
Commit 76187e9a7953d932adab2a7d8ead6ad290e9ab73
Headers show

Comments

Jonathan Liu - June 13, 2013, 12:31 p.m.
Setting LLVM_RELEASE is redundant as the version can be retrieved from
PV instead.

Signed-off-by: Jonathan Liu <net147@gmail.com>
---
 meta-oe/recipes-core/llvm/llvm3.2_3.2.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Patch

diff --git a/meta-oe/recipes-core/llvm/llvm3.2_3.2.bb b/meta-oe/recipes-core/llvm/llvm3.2_3.2.bb
index 673892f..71a53c1 100644
--- a/meta-oe/recipes-core/llvm/llvm3.2_3.2.bb
+++ b/meta-oe/recipes-core/llvm/llvm3.2_3.2.bb
@@ -18,8 +18,7 @@  inherit autotools perlnative pythonnative
 
 LLVM_BUILD_DIR = "${WORKDIR}/llvm-${PV}.build"
 LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install"
-LLVM_RELEASE = "3.2"
-LLVM_DIR = "llvm${LLVM_RELEASE}"
+LLVM_DIR = "llvm${PV}"
 
 EXTRA_OECONF += "--disable-assertions \
                  --enable-debug-runtime \
@@ -92,7 +91,7 @@  do_install() {
 
 	install -d ${D}${libdir}/${LLVM_DIR}
 	mv ${LLVM_INSTALL_DIR}${libdir}/* ${D}${libdir}/${LLVM_DIR}/
-	ln -s ${LLVM_DIR}/libLLVM-${LLVM_RELEASE}.so ${D}${libdir}/libLLVM-${LLVM_RELEASE}.so
+	ln -s ${LLVM_DIR}/libLLVM-${PV}.so ${D}${libdir}/libLLVM-${PV}.so
 
 	install -d ${D}${docdir}/${LLVM_DIR}
 	mv ${LLVM_INSTALL_DIR}${prefix}/docs/llvm/* ${D}${docdir}/${LLVM_DIR}
@@ -102,5 +101,5 @@  SYSROOT_PREPROCESS_FUNCS += "llvm_sysroot_preprocess"
 
 llvm_sysroot_preprocess() {
 	install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}
-	mv ${LLVM_INSTALL_DIR}/llvm-config-host ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${LLVM_RELEASE}
+	mv ${LLVM_INSTALL_DIR}/llvm-config-host ${SYSROOT_DESTDIR}${bindir_crossscripts}/llvm-config${PV}
 }