From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-libs/rocclr/Manifest | 7 ++- .../rocclr/files/rocclr-3.5.0-find-opencl.patch | 49 ++++++++++++++++++++ .../rocclr-3.7.0-cmake-install-destination.patch | 52 ++++++++++++++++++++++ dev-libs/rocclr/rocclr-3.5.0-r1.ebuild | 46 +++++++++++++++++++ dev-libs/rocclr/rocclr-3.5.0.ebuild | 45 ------------------- dev-libs/rocclr/rocclr-3.7.0-r1.ebuild | 43 ++++++++++++++++++ 6 files changed, 196 insertions(+), 46 deletions(-) create mode 100644 dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch create mode 100644 dev-libs/rocclr/files/rocclr-3.7.0-cmake-install-destination.patch create mode 100644 dev-libs/rocclr/rocclr-3.5.0-r1.ebuild delete mode 100644 dev-libs/rocclr/rocclr-3.5.0.ebuild create mode 100644 dev-libs/rocclr/rocclr-3.7.0-r1.ebuild (limited to 'dev-libs/rocclr') diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest index b60bd644654b..0e3251178d53 100644 --- a/dev-libs/rocclr/Manifest +++ b/dev-libs/rocclr/Manifest @@ -1,5 +1,10 @@ AUX rocclr-3.5.0-cmake-install-destination.patch 1743 BLAKE2B cacc53fe9ca31a90e294fc75d611d3dec70a196cbd8456f3c7d21639cd8d1a30e2bbfc336756936995b7bc1e23b4ce486410aff10e3f39a1d6da627d74a4ac81 SHA512 2675850ee6f1cf3b8ea66a9f54cfb35573f2d6ff1fe56b69630fe1323bdf916357eefb5927692bba58ec7007be24f2d1b2734ee13a81afe72c36fa59c4de5f28 +AUX rocclr-3.5.0-find-opencl.patch 1538 BLAKE2B cde3a6af047a3d2aef58e54930398787927d45683f210cd558a5afe55fc22d0ef426080c2b099dfad9baa6bf9a9269b42bc28bfb7f51b069acf3fbc45c1bc3d7 SHA512 0b264d77d30519d174a3724fe3d55f4875e1d6ff2747595ffc9d585eec2c91e69da93e75865d7899054026c7db4350dc8264429e642c77471af1379936ccc65d +AUX rocclr-3.7.0-cmake-install-destination.patch 1487 BLAKE2B bba1dbe3a029db770c66ec6cb11e2d79e165e98a9a8db1c1aec4abd4b627eb2c6af57d838977e558291c7339d36399d43307a1806604b1c1c87d448433e03eba SHA512 7ba64b84526342c20d9f750c2298d6839c608f83f2b10e63bf5dff610ce8127247b41572c0b14fba84ddf02947ec3f2a7e954e75844105de60329c144ef16ef2 DIST rocclr-3.5.0.tar.gz 874139 BLAKE2B 027403d51c86aa492c0951f8d75bd90493fc0fbe99987e9f443a9fa0b86fc69335a4a6625b5af67231b99c9e0b0adbd914e11369fb2a2b1acb3b5254e475b09f SHA512 732c439f900896c0e065b64054a789edbc0258a0e53723077e578b99bd59925517b201c31a428389cc0dbd100051df8344378aee4a0c2c294110ad9bcf1a3098 +DIST rocclr-3.7.0.tar.gz 881814 BLAKE2B 5d7c70d52d8c06e421bdf2a02dba35ed70509c9154fbe3b8c3193969b37970d5f52d1a67eff46abe95b8af1932f2c6931b18380d046f633a3870fe95c4bfc651 SHA512 8684cc9b4f9f63ef65bcc286b74c51e3f7d334f0245b5a1fca6d3dfa0bb552fccb6b82419b538aebe1d316aa2c41a28a9a21df459b734aa44923d66d725834e1 DIST rocm-opencl-runtime-3.5.0.tar.gz 734076 BLAKE2B cc6992999188968c628b378f637c8073c99381fab42e05d7d9d89d75fe9f2bd3d573f61f00a18c078542f7fc4a3a856385d0f34fa9bb599dd63de8be18594bdf SHA512 658649c3f13d32308f8f031f26b62c20bda4841059b5ea0db5c6a827af26b07aa0bdee07a461cc4b3c37108b3f25ae59b1658fab30125f84c0729fb57c2fa014 -EBUILD rocclr-3.5.0.ebuild 1272 BLAKE2B 90c6bf25ff0812121ff24d19d93cd81ee039602891b41ee86ee23c2e789e686733d28e8aa5448aca6b383f56c7901039b7c9f5cad3123b0e0e90934922e4d0fc SHA512 736fbd3cfbe6746c366d41cb4b71ceec1ddf975ecc0a6c8c88a443b294fab02226e6bec0b13b9810f4b548f6da7c1a7e59c0661b25ae78d883fde265c91a9b8a +DIST rocm-opencl-runtime-3.7.0.tar.gz 1004361 BLAKE2B 7fa9481c77884dda15a3b0335449b2879fbac000f644fc56bbd8d06c5fd77d8355f159b9b7e8920f06351e388d0df41379b7e1fcff51cf81714a28f902218e42 SHA512 6ea509dde0290f13e66497eaad587099ed6a98df967adce207afc857ecd961b65801332ca74e36173719488639480cfcffc625a007345d0e48c10c8a0efdfa3f +EBUILD rocclr-3.5.0-r1.ebuild 1301 BLAKE2B 1d67bf666b69871767060f7742a575b6326e8007c1783c23597a30a8396c17e8323e09a31bfc5d12eb2837e5abf5a7711a0f359adb83d64b0d01a9c30eba0e40 SHA512 9cb182fada78acbe442e65c2f3674087a332f87972524246d0916c267b3bef465fc8adda0ce1b045f57d8c1942fe15304cb7d94257799801c6576ad17e9e45a6 +EBUILD rocclr-3.7.0-r1.ebuild 1125 BLAKE2B 5835e53e68b6cb6300ad505a23963989291740ebb872175c873a66f8d37f618dad954cefb0b29efcd82571b4017dbf92fd808b5b533a5b91844a9797d19ca15b SHA512 27e2425539f6dd0822c747f57ebbb158ca77994ee6b7ba351b771d2ee255a4ef49f9f7d9b3839a9919d1eec9d4271edef6db9260aad15e127b6ed336bed9f286 MISC metadata.xml 497 BLAKE2B f21bb8a043e512036294e7af578c86aec248b4d8fd76bbb2c86026d7c1c8cc4e0bdd1725685ea3ff861dc2a63708b740fa45c7e19b95589de0fd6fac4391b3e8 SHA512 5275f1799db5d847e09eae59d624ecf40134513a3c9c370a6ad05ea0808b7f456eae32a37c1501e156d26d155a8f692d4f661757c0a2f0b436cc46666930850d diff --git a/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch b/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch new file mode 100644 index 000000000000..fc9bacee5020 --- /dev/null +++ b/dev-libs/rocclr/files/rocclr-3.5.0-find-opencl.patch @@ -0,0 +1,49 @@ +From 98df37fc36b6276c26532e86e89be7e389745f4e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Torsten=20Ke=C3=9Fler?= +Date: Sun, 19 Jul 2020 11:58:24 +0200 +Subject: [PATCH] Fix search for OpenCL include dirs + +--- + CMakeLists.txt | 26 +++++++++----------------- + 1 file changed, 9 insertions(+), 17 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 122277ee..02ca4644 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,26 +53,18 @@ find_package(amd_comgr REQUIRED CONFIG + ) + message(STATUS "Code Object Manager found at ${amd_comgr_DIR}.") + +-# FIXME: Use find_package(OpenCL) +-find_library( OpenCL REQUIRED CONFIG +- PATHS +- /opt/rocm ++find_path(OPENCL_INCLUDE_DIR ++ NAMES OpenCL/cl.h CL/cl.h ++ PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64 ++ PATHS ${OPENCL_DIR} ++ DOC "OpenCL include header OpenCL/cl.h or CL/cl.h" + ) + +-if( NOT OPENCL_DIR ) +- find_path(OPENCL_INCLUDE_DIR +- NAMES OpenCL/cl.h CL/cl.h +- PATH_SUFFIXES include opencl/include inc include/x86_64 include/x64 +- PATHS /opt/rocm +- DOC "OpenCL include header OpenCL/cl.h or CL/cl.h" +- ) +- +- if( NOT OPENCL_INCLUDE_DIR ) +- unset(OPENCL_INCLUDE_DIR CACHE) +- set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE ) +- endif() +- message(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.") ++if( NOT OPENCL_INCLUDE_DIR ) ++ unset(OPENCL_INCLUDE_DIR CACHE) ++ set(OPENCL_INCLUDE_DIR "" CACHE PATH "" FORCE ) + endif() ++message(STATUS "Opencl found at ${OPENCL_INCLUDE_DIR}.") + + + diff --git a/dev-libs/rocclr/files/rocclr-3.7.0-cmake-install-destination.patch b/dev-libs/rocclr/files/rocclr-3.7.0-cmake-install-destination.patch new file mode 100644 index 000000000000..3629fc71b3b3 --- /dev/null +++ b/dev-libs/rocclr/files/rocclr-3.7.0-cmake-install-destination.patch @@ -0,0 +1,52 @@ +--- a/CMakeLists.txt 2020-08-22 23:59:26.674785914 +0200 ++++ b/CMakeLists.txt 2020-08-23 00:01:18.491783097 +0200 +@@ -253,8 +253,8 @@ + + install( TARGETS amdrocclr_static + EXPORT rocclr +- ARCHIVE DESTINATION lib +- LIBRARY DESTINATION lib ++ ARCHIVE DESTINATION lib64 ++ LIBRARY DESTINATION lib64 + COMPONENT applications) + + install ( +@@ -262,31 +262,31 @@ + DESTINATION include) + install ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/elf" +- DESTINATION include ++ DESTINATION include/rocclr + FILES_MATCHING PATTERN "*.h*") + install ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/compiler" +- DESTINATION include ++ DESTINATION include/rocclr + FILES_MATCHING PATTERN "*.h*") + install ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/utils" +- DESTINATION include ++ DESTINATION include/rocclr + FILES_MATCHING PATTERN "*.h*") + install ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/platform" +- DESTINATION include ++ DESTINATION include/rocclr + FILES_MATCHING PATTERN "*.h*") + install ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/thread" +- DESTINATION include ++ DESTINATION include/rocclr + FILES_MATCHING PATTERN "*.h*") + install ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/os" +- DESTINATION include ++ DESTINATION include/rocclr + FILES_MATCHING PATTERN "*.h*") + install ( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/device" +- DESTINATION include ++ DESTINATION include/rocclr + FILES_MATCHING PATTERN "*.h*") + + # Generate the install-tree package. diff --git a/dev-libs/rocclr/rocclr-3.5.0-r1.ebuild b/dev-libs/rocclr/rocclr-3.5.0-r1.ebuild new file mode 100644 index 000000000000..2601b431de18 --- /dev/null +++ b/dev-libs/rocclr/rocclr-3.5.0-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Radeon Open Compute Common Language Runtime" +HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr" +SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/roc-${PV}.tar.gz -> ${P}.tar.gz + https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +RDEPEND=">=dev-libs/rocm-comgr-${PV}" +DEPEND="${RDEPEND} + >=dev-libs/rocm-comgr-${PV} + virtual/opengl + >=dev-util/rocm-cmake-${PV}" + +PATCHES=( + "${FILESDIR}/rocclr-3.5.0-cmake-install-destination.patch" + "${FILESDIR}/rocclr-3.5.0-find-opencl.patch" +) + +S="${WORKDIR}/ROCclr-roc-${PV}" + +src_configure() { + local mycmakeargs=( + -DUSE_COMGR_LIBRARY=YES + -DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}" + -DCMAKE_INSTALL_PREFIX="/usr" + ) + cmake_src_configure +} + +src_install() { + # This should be fixed in the CMakeLists.txt to get this installed automatically + sed -e "s:${BUILD_DIR}:${EPREFIX}/usr/$(get_libdir):" -i "${BUILD_DIR}/amdrocclr_staticTargets.cmake" + insinto /usr/$(get_libdir)/cmake/rocclr + doins "${BUILD_DIR}/amdrocclr_staticTargets.cmake" + + cmake_src_install +} diff --git a/dev-libs/rocclr/rocclr-3.5.0.ebuild b/dev-libs/rocclr/rocclr-3.5.0.ebuild deleted file mode 100644 index a82c2461e653..000000000000 --- a/dev-libs/rocclr/rocclr-3.5.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Radeon Open Compute Common Language Runtime" -HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr" -SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/roc-${PV}.tar.gz -> ${P}.tar.gz - https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64" - -RDEPEND=">=dev-libs/rocm-comgr-${PV}" -DEPEND="${RDEPEND} - >=dev-libs/rocm-comgr-${PV} - virtual/opengl - >=dev-util/rocm-cmake-${PV}" - -PATCHES=( - "${FILESDIR}/rocclr-3.5.0-cmake-install-destination.patch" -) - -S="${WORKDIR}/ROCclr-roc-${PV}" - -src_configure() { - local mycmakeargs=( - -DUSE_COMGR_LIBRARY=YES - -DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}" - -DCMAKE_INSTALL_PREFIX="/usr" - ) - cmake_src_configure -} - -src_install() { - # This should be fixed in the CMakeLists.txt to get this installed automatically - sed -e "s:/var/tmp/portage/dev-libs/${PF}/work/rocclr-${PV}_build:/usr/lib64:" -i "${BUILD_DIR}/amdrocclr_staticTargets.cmake" - insinto /usr/lib64/cmake/rocclr - doins "${BUILD_DIR}/amdrocclr_staticTargets.cmake" - - cmake_src_install -} diff --git a/dev-libs/rocclr/rocclr-3.7.0-r1.ebuild b/dev-libs/rocclr/rocclr-3.7.0-r1.ebuild new file mode 100644 index 000000000000..04b209388e32 --- /dev/null +++ b/dev-libs/rocclr/rocclr-3.7.0-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="Radeon Open Compute Common Language Runtime" +HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr" +SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz + https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz" + +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" +KEYWORDS="~amd64" + +RDEPEND=">=dev-libs/rocm-comgr-${PV}" +DEPEND="${RDEPEND} + >=dev-libs/rocm-comgr-${PV} + virtual/opengl + >=dev-util/rocm-cmake-${PV}" + +PATCHES=( + "${FILESDIR}/rocclr-3.7.0-cmake-install-destination.patch" +) + +S="${WORKDIR}/ROCclr-rocm-${PV}" + +src_configure() { + local mycmakeargs=( + -DUSE_COMGR_LIBRARY=YES + -DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}" + -DCMAKE_INSTALL_PREFIX="/usr" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + # This should be fixed in the CMakeLists.txt + sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die +} -- cgit v1.2.3