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 C884B138359 for ; Tue, 25 Aug 2020 21:08:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43723E0970; Tue, 25 Aug 2020 21:08:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 1FAD3E0970 for ; Tue, 25 Aug 2020 21:08:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 952A7340F10 for ; Tue, 25 Aug 2020 21:08:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E662C331 for ; Tue, 25 Aug 2020 21:08:14 +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: <1598389685.7826f372ef2ea40a659ac53593aacb3523acc60f.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/rocr-runtime/, dev-libs/rocr-runtime/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/rocr-runtime/Manifest dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch dev-libs/rocr-runtime/files/rocr-runtime-3.5.0-cmake-install-paths.patch dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild X-VCS-Directories: dev-libs/rocr-runtime/ dev-libs/rocr-runtime/files/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: 7826f372ef2ea40a659ac53593aacb3523acc60f X-VCS-Branch: master Date: Tue, 25 Aug 2020 21:08:14 +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: 57b08dfc-248f-4d6a-92a9-2cf5ce993b00 X-Archives-Hash: a337d007587fa4f5ef168dd331373641 commit: 7826f372ef2ea40a659ac53593aacb3523acc60f Author: Craig Andrews gentoo org> AuthorDate: Tue Aug 25 21:01:41 2020 +0000 Commit: Craig Andrews gentoo org> CommitDate: Tue Aug 25 21:08:05 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7826f372 dev-libs/rocr-runtime: Cleanup old versions Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Craig Andrews gentoo.org> dev-libs/rocr-runtime/Manifest | 4 -- .../rocr-runtime-3.0.0-cmake-install-paths.patch | 45 ---------------------- .../rocr-runtime-3.5.0-cmake-install-paths.patch | 35 ----------------- dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild | 37 ------------------ dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild | 37 ------------------ dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild | 37 ------------------ dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild | 37 ------------------ 7 files changed, 232 deletions(-) diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest index d0f1a066964..14ae92168b7 100644 --- a/dev-libs/rocr-runtime/Manifest +++ b/dev-libs/rocr-runtime/Manifest @@ -1,5 +1 @@ -DIST rocr-runtime-3.0.0.tar.gz 327908 BLAKE2B 0d95ecc22d27e470dd46f02aca012c59e8d0b0bd76de21133a1198d2daa75547600d95ea6c3a3771da36ce3fdf5e197b40ff68543b71adf36d33079a9d9496ab SHA512 e1a1eeec67bca02defc6f502e94dab71e48833737cc0f45552781c5b0cc36bff9147b2c477d6c2c3c9bd25654569ad1d91cd06aa81fcf412657a489cb56c5674 -DIST rocr-runtime-3.1.0.tar.gz 329176 BLAKE2B 845dcfc5a00e6d571bfef6330b370f588496de95ee7e04caf9c29f81e389f3e82dcdace11d48c86b01119cc0e73bf0a50949da9c4f5383044360f59176670d95 SHA512 a9b540341c649786aa0b53755fc51f540425d67c5a567834abbef9bb55c9b0120b1f14c082bfbc97f3c2a586aa846853f293093116aa8625dc34cae6fe50683a -DIST rocr-runtime-3.3.0.tar.gz 329386 BLAKE2B 59eb0838d377bb8b10887d7fb432e634190196516fff30a9401b591f2bb7846938c5486bac921fb4fce905a3acfbf4dd064ed9b53122da847fd5fb3d3d2f701c SHA512 ec7950aacd84c318978b9abbad0aafcae1e2d7d7c77806432bde0ce861372e6db92d74ba6445d3ac92c835aa0137b1929d27ddee77b9dae92ca2465a70c4878d -DIST rocr-runtime-3.5.0.tar.gz 336269 BLAKE2B afde0f9fcfad389a56f31352036174b8b2a5e9960f5bbcff8a7ca9dc54e4b68d92b70afa70af5aa43d040749bccd2df957df89fea1036890abdaf7e6a5c3b620 SHA512 20d95b13dccf2fe5b8da5859661a21279f18d1c45899782c55477265500057708360ce2049a8e9b3aadbcb33f8e4274459edb17a8455dc3db69ccf31b86a581e DIST rocr-runtime-3.7.0.tar.gz 691234 BLAKE2B b0f3b1ff6c13c132d00bbf30d405746e793aae377aca2279117c7b9dd6fdc1d466ef2076947061c848913378a20ee0dc7e32847c62a7416e4088ab0705d17dfd SHA512 f7fa77524d7f63980194e93a8e3124f1471dcdfec6ede5eb993699083e5d8fba28737fcc63dbd61949e3ce60e9fbd1455ec055a0aa5c7eee724ae6bb61d3b24f diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch deleted file mode 100644 index 29429d0c480..00000000000 --- a/dev-libs/rocr-runtime/files/rocr-runtime-3.0.0-cmake-install-paths.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/51 - -From 09a835e8de2d88e917328a78765a1db423d21920 Mon Sep 17 00:00:00 2001 -From: Craig Andrews -Date: Sun, 29 Dec 2019 16:57:00 -0500 -Subject: [PATCH] Correctly install the library into the system - -Install to standard locations in /usr/{lib,include}/lib (as opposed to /usr/hsa/{lib,include}/hsa) -Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR from GNUInstallDirs instead of using "lib" and "include" ---- - CMakeLists.txt | 13 +++---------- - 1 file changed, 3 insertions(+), 10 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f292182..7474dd2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -61,6 +61,7 @@ endif() # if (ROCM_CCACHE_BUILD) - - list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" ) - include ( utils ) -+include ( GNUInstallDirs ) - include ( hsa_common ) - - ## Find LibElf -@@ -176,17 +177,9 @@ endif () - set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY VERSION "${SO_VERSION_STRING}" ) - set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY SOVERSION "${SO_MAJOR}" ) - --## Create symlinks for legacy packaging and install --add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa_include_link ) --add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so ) --add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} ) -- - ## Set install information --install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION hsa/lib ) --install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa ) --install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa ) --install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so ) --install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} ) -+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa ) - - ## Packaging directives - set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Package types to build") diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-3.5.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-3.5.0-cmake-install-paths.patch deleted file mode 100644 index a98a5f450f0..00000000000 --- a/dev-libs/rocr-runtime/files/rocr-runtime-3.5.0-cmake-install-paths.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/CMakeLists.txt 2020-06-06 18:15:44.473493765 +0200 -+++ b/CMakeLists.txt 2020-06-06 18:25:47.688491464 +0200 -@@ -66,6 +66,7 @@ - - list ( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" ) - include ( utils ) -+include ( GNUInstallDirs ) - include ( hsa_common ) - - ## Find LibElf -@@ -185,22 +186,9 @@ - set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY VERSION "${SO_VERSION_STRING}" ) - set_property ( TARGET ${CORE_RUNTIME_TARGET} PROPERTY SOVERSION "${SO_MAJOR}" ) - --## Create symlinks for legacy packaging and install --add_custom_target ( hsa_include_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa_include_link ) --if ( ${BUILD_SHARED_LIBS} ) -- add_custom_target ( hsa_lib_link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}-link.so ) -- add_custom_target ( hsa_lib_link2 ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} ${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} ) --endif() -- - ## Set install information --install ( TARGETS ${CORE_RUNTIME_TARGET} DESTINATION hsa/lib COMPONENT binary) --install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa COMPONENT binary) --install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa_include_link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa COMPONENT dirlink) -- --if ( ${BUILD_SHARED_LIBS} ) -- install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so COMPONENT binary) -- install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}-link.so.${SO_MAJOR} DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so.${SO_MAJOR} COMPONENT binary) --endif () -+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) -+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa ) - - ## Packaging directives - set ( CPACK_GENERATOR "DEB;RPM" CACHE STRING "Package types to build") diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild deleted file mode 100644 index d6ba469a09f..00000000000 --- a/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# 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/ROCR-Runtime/" - inherit git-r3 - S="${WORKDIR}/${P}/src" -else - SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src" - KEYWORDS="~amd64" -fi - -DESCRIPTION="Radeon Open Compute Runtime" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime" -PATCHES=( - "${FILESDIR}/${PN}-3.0.0-cmake-install-paths.patch" -) - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -IUSE="non-free" - -COMMON_DEPEND="sys-process/numactl" -RDEPEND="${COMMON_DEPEND} - non-free? ( dev-libs/hsa-ext-rocr )" -DEPEND="${COMMON_DEPEND} - >=dev-libs/roct-thunk-interface-${PV}" - -src_prepare() { - sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die - cmake_src_prepare -} diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild deleted file mode 100644 index d6ba469a09f..00000000000 --- a/dev-libs/rocr-runtime/rocr-runtime-3.1.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# 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/ROCR-Runtime/" - inherit git-r3 - S="${WORKDIR}/${P}/src" -else - SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCR-Runtime-roc-${PV}/src" - KEYWORDS="~amd64" -fi - -DESCRIPTION="Radeon Open Compute Runtime" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime" -PATCHES=( - "${FILESDIR}/${PN}-3.0.0-cmake-install-paths.patch" -) - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -IUSE="non-free" - -COMMON_DEPEND="sys-process/numactl" -RDEPEND="${COMMON_DEPEND} - non-free? ( dev-libs/hsa-ext-rocr )" -DEPEND="${COMMON_DEPEND} - >=dev-libs/roct-thunk-interface-${PV}" - -src_prepare() { - sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die - cmake_src_prepare -} diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild deleted file mode 100644 index 27a97d1c760..00000000000 --- a/dev-libs/rocr-runtime/rocr-runtime-3.3.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# 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/ROCR-Runtime/" - inherit git-r3 - S="${WORKDIR}/${P}/src" -else - SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src" - KEYWORDS="~amd64" -fi - -DESCRIPTION="Radeon Open Compute Runtime" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime" -PATCHES=( - "${FILESDIR}/${PN}-3.0.0-cmake-install-paths.patch" -) - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -IUSE="non-free" - -COMMON_DEPEND="sys-process/numactl" -RDEPEND="${COMMON_DEPEND} - non-free? ( dev-libs/hsa-ext-rocr )" -DEPEND="${COMMON_DEPEND} - >=dev-libs/roct-thunk-interface-${PV}" - -src_prepare() { - sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die - cmake_src_prepare -} diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild deleted file mode 100644 index 5d787962fa1..00000000000 --- a/dev-libs/rocr-runtime/rocr-runtime-3.5.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# 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/ROCR-Runtime/" - inherit git-r3 - S="${WORKDIR}/${P}/src" -else - SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src" - KEYWORDS="~amd64" -fi - -DESCRIPTION="Radeon Open Compute Runtime" -HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime" -PATCHES=( - "${FILESDIR}/${PN}-3.5.0-cmake-install-paths.patch" -) - -LICENSE="MIT" -SLOT="0/$(ver_cut 1-2)" -IUSE="non-free" - -COMMON_DEPEND="sys-process/numactl" -RDEPEND="${COMMON_DEPEND} - non-free? ( dev-libs/hsa-ext-rocr )" -DEPEND="${COMMON_DEPEND} - >=dev-libs/roct-thunk-interface-${PV}" - -src_prepare() { - sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die - cmake_src_prepare -}