From 026cb1f7203a16dfd831b7d4901a186c8c446f36 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 31 Jul 2017 09:27:28 -0700 Subject: compiler-rt: Use final version string in install paths We append SRCPV to PV which is not what we want for install dir name, it should be final compiler-rt release version e.g. 5.0.0 Signed-off-by: Khem Raj --- recipes-devtools/clang/compiler-rt_git.bb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/recipes-devtools/clang/compiler-rt_git.bb b/recipes-devtools/clang/compiler-rt_git.bb index 413efd6..50e83b3 100644 --- a/recipes-devtools/clang/compiler-rt_git.bb +++ b/recipes-devtools/clang/compiler-rt_git.bb @@ -63,23 +63,25 @@ do_install() { do_install_append () { - install -d ${D}${libdir}/clang/${PV}/lib/linux + install -d ${D}${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux if [ -d ${D}${libdir}/linux ]; then for f in `find ${D}${libdir}/linux -maxdepth 1 -type f` do - mv $f ${D}${libdir}/clang/${PV}/lib/linux + mv $f ${D}${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux done rmdir ${D}${libdir}/linux fi for f in `find ${D}${exec_prefix} -maxdepth 1 -name '*.txt' -type f` do - mv $f ${D}${libdir}/clang/${PV} + mv $f ${D}${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER} done } FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/clang/${PV}/lib/linux/lib*${SOLIBSDEV} ${libdir}/clang/${PV}/*.txt" -FILES_${PN}-staticdev += "${libdir}/clang/${PV}/lib/linux/*.a" +FILES_${PN} += "${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/lib*${SOLIBSDEV} \ + ${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/*.txt" +FILES_${PN}-staticdev += "${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.a" +FILES_${PN}-dev += "${libdir}/clang/${MAJOR_VER}.${MINOR_VER}.${PATCH_VER}/lib/linux/*.syms" INSANE_SKIP_${PN} = "dev-so" #PROVIDES_append_class-target = "\ @@ -91,8 +93,6 @@ INSANE_SKIP_${PN} = "dev-so" # " # -FILES_${PN}-dev += "${libdir}/clang/${PV}/lib/linux/*.syms" - BBCLASSEXTEND = "native nativesdk" ALLOW_EMPTY_${PN} = "1" -- cgit v1.2.3-54-g00ecf