diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
commit | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch) | |
tree | 326613a08f25851c388715e205576a2e7d25dc4f /dev-libs/rocm-opencl-driver | |
parent | b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff) |
gentoo resync : 18.08.2019
Diffstat (limited to 'dev-libs/rocm-opencl-driver')
6 files changed, 181 insertions, 0 deletions
diff --git a/dev-libs/rocm-opencl-driver/Manifest b/dev-libs/rocm-opencl-driver/Manifest new file mode 100644 index 000000000000..f9c0afae528d --- /dev/null +++ b/dev-libs/rocm-opencl-driver/Manifest @@ -0,0 +1,7 @@ +AUX rocm-opencl-driver-2.6.0-install-correctly.patch 1931 BLAKE2B a0bb45e0bf08b777e88804cfe77eadebe1181aa4488885333c9996bbaa0177f7211b16f1fac30e743d53efaa63f59c28b2e928eb2ed6e5396ee2fa6862782caa SHA512 547bf0901a7ef8ac3ae3822dff77ab3409f39c6038c906acfa49579c7652dcd44d235331bd44cab2e5abb9ce1adcc75320f7476cc88666a45d303352e09ef20c +AUX rocm-opencl-driver-2.6.0-install-header.patch 828 BLAKE2B 5640501a48f6d8552edf7fc89608dc7ff3d7ebe353c88759707e37ec9597a2b6a4cd982a17bf87e30f8f6def80a3a1fd866769b3f2d2572dd8506804ce7e3143 SHA512 f8569519b47f194f58fcb3a2b54f51157be792200004c7bebfde6fb7fea574eac3bec69ab0ea73ff4ef030a9335fdaa21ae22e8655661fab65e11a1a0492395f +DIST rocm-opencl-driver-2.6.0.tar.gz 21311 BLAKE2B f17219b577ccd58de052d5936953fd78588a0b042ce002853b10c05e6f6d433edcd90045c15dcd2f2c31ccef89f8b420ef756a1dd1613702efcc8868163878d1 SHA512 7b8bf646d9a36b09d75a0408301c2f1771daad95b8075b1671ca0c8b1f5826e8cd9de8935946858268dc89863a0ee054b4dde3040c84dd37e90f28c7ffa6e097 +DIST rocm-opencl-driver-2.7.0.tar.gz 21312 BLAKE2B 8c7233e8c5de2d92d0604a832475a474e5a171853f435908dbe73ab41d077f9f4c2d7069546b4e660d900c02cccf1f77d85d2fbe5ddb52fdde4c32d6c26910a2 SHA512 ee14bbbf502ffc00fd9e1e04224ae8109c8603d44438cddde8951c2d2caf5d45b94d39eb184af66462b4029759064aab0e2312b44fdd3f925064ebe6097ac49b +EBUILD rocm-opencl-driver-2.6.0.ebuild 1166 BLAKE2B 4e94bb069a67cd2e0e4dfed81fd46cd331b980b5c2d615932adf988be6708f8d27a000672b81b00c34cc29ce2660aa71f0960bb716c43d1d1dc824c7e3f1b0d5 SHA512 ad72eef3737a65c333d26539150271d82a1ce31618d345c9b9acd485a72948e291ccd147985323ad724544efe9298e4369037213410565f5a37514aedbafe5f1 +EBUILD rocm-opencl-driver-2.7.0.ebuild 1196 BLAKE2B 1c5f07259df697ee75d2b25a652d1c274c9d1fae914a79e0cbc639b8fbebd3c78088afd528920a004bc399d6f259c7f892b26841af776a24370d1730dabb8c51 SHA512 64afcc72b31176174e5657e66f694df91b9ce644e4f2df78fd26a943922f42fe9378f42a217a232cf39774421ed750fbc9111503bacd2b7e22376a52e968ac89 +MISC metadata.xml 489 BLAKE2B d989103f6ed0e6a7406558565a5d0453046f640fbef964eb84e51fc911dac4bcc57bc3f1c5222bb5f6d2fb6d10a7f83b4172161070029b0d537b475ef8473f04 SHA512 3bfb9c1ed4cd559aefaf7a74567daf0952359a9fa3e703f1dfaac48d9bb7a25d134afe16e7509c28dff8a5cdabe09870d8f541898756c028b5c5996577956f0a diff --git a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch new file mode 100644 index 000000000000..d70f0977ec8f --- /dev/null +++ b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-correctly.patch @@ -0,0 +1,49 @@ +https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/pull/85 + +From 8819a684c9b6e154abedc041b3da545aab353d67 Mon Sep 17 00:00:00 2001 +From: Craig Andrews <candrews@integralblue.com> +Date: Fri, 26 Jul 2019 15:54:59 -0400 +Subject: [PATCH] Use GNUInstallDirs to install to standard locations + +Some distributions require 64 bit libraries to be installed to lib64, for example. +Using GNUInstallDirs ensures that files are installed to the expected locations. +--- + CMakeLists.txt | 3 +++ + src/driver/CMakeLists.txt | 2 +- + src/roc-cl/CMakeLists.txt | 2 +- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d1759b7..d21e9da 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,6 +42,9 @@ + + cmake_minimum_required(VERSION 2.8) + ++## Include common cmake modules ++include ( GNUInstallDirs ) ++ + # Build ROCm-OpenCL-Driver with ccache if the package is present. + set(ROCM_OPENCL_DRIVER_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache enabled build") + if(ROCM_OPENCL_DRIVER_CCACHE_BUILD) +diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt +index 7046e34..55ed13f 100644 +--- a/src/driver/CMakeLists.txt ++++ b/src/driver/CMakeLists.txt +@@ -90,4 +90,4 @@ target_link_libraries(opencl_driver + target_link_libraries(opencl_driver ${llvm_libs}) + target_include_directories(opencl_driver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +-install(TARGETS opencl_driver DESTINATION lib) ++install(TARGETS opencl_driver DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +diff --git a/src/roc-cl/CMakeLists.txt b/src/roc-cl/CMakeLists.txt +index 5037453..a8e2801 100644 +--- a/src/roc-cl/CMakeLists.txt ++++ b/src/roc-cl/CMakeLists.txt +@@ -54,4 +54,4 @@ link_directories(${LLVM_LIBRARY_DIRS}) + add_executable(roc-cl ${sources}) + target_link_libraries(roc-cl opencl_driver) + +-install(TARGETS roc-cl RUNTIME DESTINATION bin) ++install(TARGETS roc-cl RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) diff --git a/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch new file mode 100644 index 000000000000..b37100994e04 --- /dev/null +++ b/dev-libs/rocm-opencl-driver/files/rocm-opencl-driver-2.6.0-install-header.patch @@ -0,0 +1,19 @@ +From 1258a99decf96092de8ea512150209e14152ed9c Mon Sep 17 00:00:00 2001 +From: Craig Andrews <candrews@integralblue.com> +Date: Tue, 30 Jul 2019 16:46:20 -0400 +Subject: [PATCH] Install AmdCompiler.h header + +ROCm-OpenCL-Runtime uses AmdCompiler.h so it should be installed to the system and made available for use +--- + src/driver/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt +index 55ed13f..8f68fb7 100644 +--- a/src/driver/CMakeLists.txt ++++ b/src/driver/CMakeLists.txt +@@ -91,3 +91,4 @@ target_link_libraries(opencl_driver ${llvm_libs}) + target_include_directories(opencl_driver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + + install(TARGETS opencl_driver DESTINATION ${CMAKE_INSTALL_LIBDIR} ) ++install(FILES AmdCompiler.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) diff --git a/dev-libs/rocm-opencl-driver/metadata.xml b/dev-libs/rocm-opencl-driver/metadata.xml new file mode 100644 index 000000000000..359755b2e5a5 --- /dev/null +++ b/dev-libs/rocm-opencl-driver/metadata.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>candrews@gentoo.org</email> + <name>Craig Andrews</name> + </maintainer> + <upstream> + <remote-id type="github">RadeonOpenCompute/ROCm-OpenCL-Runtime</remote-id> + </upstream> + <longdescription lang="en"> + Radeon Open Compute OpenCL Compatible Runtime + </longdescription> +</pkgmetadata> diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild new file mode 100644 index 000000000000..6ab3d1073d10 --- /dev/null +++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.6.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/" + inherit git-r3 +else + SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +IUSE="test" + +RDEPEND="sys-devel/llvm-roc:= + dev-libs/rocr-runtime" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${P}-install-correctly.patch" + "${FILESDIR}/${P}-install-header.patch" +) + +src_prepare() { + # remove unittest, because it downloads additional file from github.com + sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/" + ) + cmake-utils_src_configure +} diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild new file mode 100644 index 000000000000..f95628a7cb79 --- /dev/null +++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.7.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/" + inherit git-r3 +else + SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/ROCm-OpenCL-Driver-roc-${PV}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Radeon Open Compute OpenCL Compiler Tool Driver" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +IUSE="test" + +RDEPEND=">=sys-devel/llvm-roc-${PV}:= + >=dev-libs/rocr-runtime-${PV}" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-2.6.0-install-correctly.patch" + "${FILESDIR}/${PN}-2.6.0-install-header.patch" +) + +src_prepare() { + # remove unittest, because it downloads additional file from github.com + sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/" + ) + cmake-utils_src_configure +} |