diff options
author | Khem Raj <raj.khem@gmail.com> | 2019-02-02 11:43:26 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-03 22:02:05 +0000 |
commit | 96631d53becca8408758b405adc670ad7e2ea2f3 (patch) | |
tree | e591e833eabd9b19ce12b8181087d379b9825831 /meta/recipes-devtools/llvm/llvm_git.bb | |
parent | 8eeb5bae02331cec3bea98adef784357c6e3c910 (diff) | |
download | openembedded-core-contrib-96631d53becca8408758b405adc670ad7e2ea2f3.tar.gz |
llvm,mesa: Upgrade to upcoming 8.0.0 release
License-Update: Copyright year updates from 2017-2019
Refresh patches to apply on new version
mesa move dep to the llvm release to 8.0
Needs to happen along with llvm upgrade always
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/llvm/llvm_git.bb')
-rw-r--r-- | meta/recipes-devtools/llvm/llvm_git.bb | 86 |
1 files changed, 37 insertions, 49 deletions
diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index eb0779d6ec..eca78af09e 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://llvm.org" LICENSE = "NCSA" SECTION = "devel" -LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=e825e017edc35cfd58e26116e5251771" +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=c6b766a4e85dd28301eeed54a6684648" DEPENDS = "libffi libxml2 zlib ninja-native llvm-native" @@ -19,18 +19,23 @@ PROVIDES += "llvm${PV}" LLVM_RELEASE = "${PV}" LLVM_DIR = "llvm${LLVM_RELEASE}" -SRCREV = "5136df4d089a086b70d452160ad5451861269498" -PV = "6.0" -BRANCH = "release_60" -PATCH_VERSION = "1" -SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH};protocol=http \ +SRCREV = "e5cc6808dc0d5b773479bf36c51d59d0d3174733" +BRANCH = "release_${MAJOR_VERSION}${MINOR_VERSION}" +MAJOR_VERSION = "8" +MINOR_VERSION = "0" +PATCH_VERSION = "0" +SOLIBVER = "1" +PV = "${MAJOR_VERSION}.${MINOR_VERSION}" +SRC_URI = "git://github.com/llvm-mirror/llvm.git;branch=${BRANCH} \ file://0001-llvm-TargetLibraryInfo-Undefine-libc-functions-if-th.patch \ file://0002-llvm-allow-env-override-of-exe-path.patch \ " UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" LLVM_INSTALL_DIR = "${WORKDIR}/llvm-install" + def get_llvm_arch(bb, d, arch_var): import re a = d.getVar(arch_var) @@ -117,71 +122,54 @@ do_install() { # Remove unnecessary cmake files rm -rf ${D}${libdir}/${LLVM_DIR}/cmake - ln -s ${LLVM_DIR}/libLLVM-${PV}${SOLIBSDEV} ${D}${libdir}/libLLVM-${PV}${SOLIBSDEV} + ln -s ${LLVM_DIR}/libLLVM-${MAJOR_VERSION}${SOLIBSDEV} ${D}${libdir}/libLLVM-${MAJOR_VERSION}${SOLIBSDEV} # We'll have to delete the libLLVM.so due to multiple reasons... rm -rf ${D}${libdir}/${LLVM_DIR}/libLLVM.so rm -rf ${D}${libdir}/${LLVM_DIR}/libLTO.so } + do_install_class-native() { install -D -m 0755 ${B}/bin/llvm-tblgen ${D}${bindir}/llvm-tblgen${PV} install -D -m 0755 ${B}/bin/llvm-config ${D}${bindir}/llvm-config${PV} - install -D -m 0755 ${B}/lib/libLLVM-${PV}.so ${D}${libdir}/libLLVM-${PV}.so + install -D -m 0755 ${B}/lib/libLLVM-${MAJOR_VERSION}.so ${D}${libdir}/libLLVM-${MAJOR_VERSION}.so } -PACKAGES += "${PN}-bugpointpasses ${PN}-llvmhello" -ALLOW_EMPTY_${PN} = "1" -ALLOW_EMPTY_${PN}-staticdev = "1" -FILES_${PN} = "" -FILES_${PN}-staticdev = "" -FILES_${PN}-dbg = " \ - ${bindir}/${LLVM_DIR}/.debug \ - ${libdir}/${LLVM_DIR}/.debug/BugpointPasses.so \ - ${libdir}/${LLVM_DIR}/.debug/LLVMHello.so \ - ${libdir}/${LLVM_DIR}/.debug/libLTO.so* \ - ${libdir}/${LLVM_DIR}/.debug/llvm-config \ - /usr/src/debug \ -" +PACKAGES =+ "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-libllvm ${PN}-liboptremarks ${PN}-liblto" -FILES_${PN}-dev = " \ - ${bindir}/${LLVM_DIR} \ - ${includedir}/${LLVM_DIR} \ - ${libdir}/${LLVM_DIR}/llvm-config \ -" - -RRECOMMENDS_${PN}-dev += "${PN}-bugpointpasses ${PN}-llvmhello" +RRECOMMENDS_${PN}-dev += "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-liboptremarks" FILES_${PN}-bugpointpasses = "\ ${libdir}/${LLVM_DIR}/BugpointPasses.so \ " -FILES_${PN} += "\ + +FILES_${PN}-libllvm = "\ + ${libdir}/${LLVM_DIR}/libLLVM-${MAJOR_VERSION}.so \ + ${libdir}/libLLVM-${MAJOR_VERSION}.so \ +" + +FILES_${PN}-liblto += "\ ${libdir}/${LLVM_DIR}/libLTO.so.* \ " +FILES_${PN}-liboptremarks += "\ + ${libdir}/${LLVM_DIR}/libOptRemarks.so.* \ +" + FILES_${PN}-llvmhello = "\ ${libdir}/${LLVM_DIR}/LLVMHello.so \ " -PACKAGES_DYNAMIC = "^libllvm${LLVM_RELEASE}-.*$" -NOAUTOPACKAGEDEBUG = "1" - -INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE}.${PATCH_VERSION} += "dev-so" -INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm-${LLVM_RELEASE} += "dev-so" -INSANE_SKIP_${MLPREFIX}libllvm${LLVM_RELEASE}-llvm += "dev-so" - -python llvm_populate_packages() { - libdir = bb.data.expand('${libdir}', d) - libllvm_libdir = bb.data.expand('${libdir}/${LLVM_DIR}', d) - split_dbg_packages = do_split_packages(d, libllvm_libdir+'/.debug', r'^lib(.*)\.so$', 'libllvm${LLVM_RELEASE}-%s-dbg', 'Split debug package for %s', allow_dirs=True) - split_packages = do_split_packages(d, libdir, r'^lib(.*)\.so$', 'libllvm${LLVM_RELEASE}-%s', 'Split package for %s', allow_dirs=True, allow_links=True, recursive=True) - split_staticdev_packages = do_split_packages(d, libllvm_libdir, r'^lib(.*)\.a$', 'libllvm${LLVM_RELEASE}-%s-staticdev', 'Split staticdev package for %s', allow_dirs=True) - if split_packages: - pn = d.getVar('PN') - d.appendVar('RDEPENDS_' + pn, ' '+' '.join(split_packages)) - d.appendVar('RDEPENDS_' + pn + '-dbg', ' '+' '.join(split_dbg_packages)) - d.appendVar('RDEPENDS_' + pn + '-staticdev', ' '+' '.join(split_staticdev_packages)) -} +FILES_${PN}-dev += " \ + ${libdir}/${LLVM_DIR}/llvm-config \ + ${libdir}/${LLVM_DIR}/libOptRemarks.so \ + ${libdir}/${LLVM_DIR}/libLLVM-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.so \ +" + +FILES_${PN}-staticdev += "\ + ${libdir}/${LLVM_DIR}/*.a \ +" -PACKAGESPLITFUNCS_prepend = "llvm_populate_packages " +INSANE_SKIP_${PN}-libllvm += "dev-so" BBCLASSEXTEND = "native nativesdk" |