From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2B5401382C5 for ; Tue, 9 Jun 2020 14:40:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47D82E087F; Tue, 9 Jun 2020 14:40:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 18D81E087F for ; Tue, 9 Jun 2020 14:40:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 66BC234E86E for ; Tue, 9 Jun 2020 14:40:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DFF9275 for ; Tue, 9 Jun 2020 14:40:36 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1591713631.3454d25f57caf63f3e2bf058abcbe13fa4a2c459.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocm-opencl-runtime/files/, dev-libs/rocm-opencl-runtime/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/rocm-opencl-runtime/Manifest dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-amdocl64icd.patch dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-change-install-location.patch dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0.ebuild X-VCS-Directories: dev-libs/rocm-opencl-runtime/files/ dev-libs/rocm-opencl-runtime/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: 3454d25f57caf63f3e2bf058abcbe13fa4a2c459 X-VCS-Branch: master Date: Tue, 9 Jun 2020 14:40:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 19ca1add-697b-4b5c-81ca-aa085ef21288 X-Archives-Hash: 3b9df59b4ca7f071ee24c020d1ed647e commit: 3454d25f57caf63f3e2bf058abcbe13fa4a2c459 Author: Wilfried Holzke holzke net> AuthorDate: Mon Jun 8 18:40:47 2020 +0000 Commit: Craig Andrews gentoo org> CommitDate: Tue Jun 9 14:40:31 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3454d25f dev-libs/rocm-opencl-runtime: ROCm-OpenCL-Runtime 3.5.0 version bump Signed-off-by: Wilfried Holzke holzke.net> Package-Manager: Portage-2.3.99, Repoman-2.3.22 Closes: https://github.com/gentoo/gentoo/pull/16128 Signed-off-by: Craig Andrews gentoo.org> dev-libs/rocm-opencl-runtime/Manifest | 1 + .../rocm-opencl-runtime-3.5.0-amdocl64icd.patch | 11 ++++ ...ncl-runtime-3.5.0-change-install-location.patch | 77 ++++++++++++++++++++++ ...cl-runtime-3.5.0-do-not-install-libopencl.patch | 14 ++++ .../rocm-opencl-runtime-3.5.0.ebuild | 57 ++++++++++++++++ 5 files changed, 160 insertions(+) diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest index 7c04e9be819..61c9de050a5 100644 --- a/dev-libs/rocm-opencl-runtime/Manifest +++ b/dev-libs/rocm-opencl-runtime/Manifest @@ -2,3 +2,4 @@ DIST OpenCL-ICD-Loader-6c03f8b58fafd9dd693eaac826749a5cfad515f8.tar.gz 63248 BLA DIST rocm-opencl-runtime-3.0.0.tar.gz 974702 BLAKE2B 2cc1eaf1aa8d8cc80de698b587bf38cfebd51b31959b9d0150e4f01ea1b41240b0311cad156c48cf531207f1a120d2151f38679a8bc4cef1e73c9c8e56dcaf45 SHA512 2a47deda34544832421fd8110dd437eaeab3a1fca498a9ac14e825402d48e81fb9fe065d078bc8bf112e0534a750fdf81a29bf5979b42f9925b1561f7bcbf6e7 DIST rocm-opencl-runtime-3.1.0.tar.gz 969782 BLAKE2B efe3cba6122273900fec80f577c45b5a93816cfd3cadbffaa36df258ea163ecc9d47530da0aa012fd7797c431506deb96fd3642c160470e2b78af75bc9fd56f6 SHA512 1665c30349547e6404563b1b1dd4258af5ab8106a66d65d6f94e7eb3ef51b2da9bc71878330c0c7ec21842e17a97e910a36be9b06fbdeab3de84bebe3a65c9db DIST rocm-opencl-runtime-3.3.0.tar.gz 969871 BLAKE2B 5dae88abc5861752b45f2b7e72a4d774786d0363a6da633d2ca1386a002374243a0655e8c5bc4aaa7a7db528f3c9bd5e6e1298561d3b06ce935865b6f0106172 SHA512 10c892cebca3db031b69ef3e1521fa11e49f40b18b621983f4f0902c9f563ff178d543fd1a05f6217f817838499436adaac883f7b474b64a54ce9eeb482382e5 +DIST rocm-opencl-runtime-3.5.0.tar.gz 734076 BLAKE2B cc6992999188968c628b378f637c8073c99381fab42e05d7d9d89d75fe9f2bd3d573f61f00a18c078542f7fc4a3a856385d0f34fa9bb599dd63de8be18594bdf SHA512 658649c3f13d32308f8f031f26b62c20bda4841059b5ea0db5c6a827af26b07aa0bdee07a461cc4b3c37108b3f25ae59b1658fab30125f84c0729fb57c2fa014 diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-amdocl64icd.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-amdocl64icd.patch new file mode 100644 index 00000000000..dadf212d3d4 --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-amdocl64icd.patch @@ -0,0 +1,11 @@ +--- a/amdocl/CMakeLists.txt 2020-06-07 14:38:38.827042792 +0200 ++++ b/amdocl/CMakeLists.txt 2020-06-07 14:38:27.505042835 +0200 +@@ -109,3 +109,8 @@ + find_package(Threads REQUIRED) + + target_link_libraries(amdocl64 amdrocclr_static Threads::Threads dl) ++ ++file(GENERATE OUTPUT "${CMAKE_BINARY_DIR}/amdocl64.icd" CONTENT "$") ++install(FILES "${CMAKE_BINARY_DIR}/amdocl64.icd" DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/OpenCL/vendors/") ++ ++ diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-change-install-location.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-change-install-location.patch new file mode 100644 index 00000000000..5de4804c7be --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-change-install-location.patch @@ -0,0 +1,77 @@ +--- a/CMakeLists.txt 2020-06-07 13:41:57.205055768 +0200 ++++ b/CMakeLists.txt 2020-06-07 16:02:45.704023540 +0200 +@@ -10,12 +10,14 @@ + #example command: + #cmake -DROCclr_DIR=/rocclr -DUSE_COMGR_LIBRARY=yes -DLIBROCclr_STATIC_DIR=/build .. + ++include (GNUInstallDirs) ++ + set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2" CACHE PATH "") + set(BUILD_SHARED_LIBS "Build shared libs" ON) + + add_subdirectory(khronos/icd) + add_subdirectory(amdocl) +-add_subdirectory(tools/clinfo) ++#add_subdirectory(tools/clinfo) + add_subdirectory(tools/cltrace) + + # get date information based on UTC +@@ -45,34 +47,34 @@ + ###--- Packaging ------------------------------------------------------------### + + # MAIN package +-install(PROGRAMS $ +- DESTINATION bin +- COMPONENT MAIN) +-install(PROGRAMS $ +- DESTINATION lib +- COMPONENT MAIN) ++#install(PROGRAMS $ ++# DESTINATION bin ++# COMPONENT MAIN) ++#install(PROGRAMS $ ++# DESTINATION lib64 ++# COMPONENT MAIN) + install(PROGRAMS $ +- DESTINATION lib +- COMPONENT MAIN) +-install(PROGRAMS $ +- DESTINATION lib +- COMPONENT MAIN) +-install(PROGRAMS $ +- DESTINATION lib ++ DESTINATION lib64 + COMPONENT MAIN) ++#install(PROGRAMS $ ++# DESTINATION lib ++# COMPONENT MAIN) ++#install(PROGRAMS $ ++# DESTINATION lib ++# COMPONENT MAIN) + + # DEV package +-install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL" +- DESTINATION include +- COMPONENT DEV +- USE_SOURCE_PERMISSIONS +- PATTERN cl_d3d10.h EXCLUDE +- PATTERN cl_d3d11.h EXCLUDE +- PATTERN cl_dx9_media_sharing.h EXCLUDE +- PATTERN cl_egl.h EXCLUDE) +-install(PROGRAMS $ +- DESTINATION lib +- COMPONENT DEV) ++#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2/CL" ++# DESTINATION include ++# COMPONENT DEV ++# USE_SOURCE_PERMISSIONS ++# PATTERN cl_d3d10.h EXCLUDE ++# PATTERN cl_d3d11.h EXCLUDE ++# PATTERN cl_dx9_media_sharing.h EXCLUDE ++# PATTERN cl_egl.h EXCLUDE) ++#install(PROGRAMS $ ++# DESTINATION lib ++# COMPONENT DEV) + + ############################# + # Packaging steps diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch new file mode 100644 index 00000000000..a74b2363c2d --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-3.5.0-do-not-install-libopencl.patch @@ -0,0 +1,14 @@ +--- a/khronos/icd/CMakeLists.txt 2020-06-07 16:05:32.425022904 +0200 ++++ b/khronos/icd/CMakeLists.txt 2020-06-07 16:06:03.273022786 +0200 +@@ -132,7 +132,7 @@ + add_subdirectory (test) + endif() + +-install (TARGETS OpenCL +- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++#install (TARGETS OpenCL ++# RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++# ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++# LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0.ebuild new file mode 100644 index 00000000000..b0fa0e30b92 --- /dev/null +++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.5.0.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/" + inherit git-r3 +else + SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/ROCm-OpenCL-Runtime-roc-${PV}" +fi + +DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime" + +LICENSE="Apache-2.0 MIT" +SLOT="0/$(ver_cut 1-2)" + +RDEPEND=">=dev-libs/rocr-runtime-${PV} + >=dev-libs/rocclr-${PV} + >=dev-libs/rocm-comgr-${PV} + >=dev-libs/rocm-device-libs-${PV} + >=virtual/opencl-3 + media-libs/mesa" +DEPEND="${RDEPEND} + dev-lang/ocaml + dev-ml/findlib" +BDEPEND=">=dev-util/rocm-cmake-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-3.5.0-change-install-location.patch" + "${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch" + "${FILESDIR}/${PN}-3.5.0-amdocl64icd.patch" +) + +src_prepare() { + # Remove "clinfo" - use "dev-util/clinfo" instead + [ -d tools/clinfo ] && rm -rf tools/clinfo || die + + # Wrong position of a '"' results in a list of strings instead of a single string and the build fails... + sed -e "s:set(CMAKE_SHARED_LINKER_FLAGS \${CMAKE_SHARED_LINKER_FLAGS} \":set(CMAKE_SHARED_LINKER_FLAGS \"\${CMAKE_SHARED_LINKER_FLAGS} :" -i "${S}/amdocl/CMakeLists.txt" + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DUSE_COMGR_LIBRARY=yes + -DROCclr_DIR=/usr/include/rocclr + -DLIBROCclr_STATIC_DIR=/usr/lib64/cmake/rocclr + ) + cmake_src_configure +}