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 C1B75138336 for ; Wed, 7 Aug 2019 17:38:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8EE17E0877; Wed, 7 Aug 2019 17:38:56 +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 47C5EE0877 for ; Wed, 7 Aug 2019 17:38:56 +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 9A4EB3494AF for ; Wed, 7 Aug 2019 17:38:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9ABD741 for ; Wed, 7 Aug 2019 17:38:52 +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: <1565199521.fc8f4d08b34d046fb9729c78f25b6e02f09de23d.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/roct-thunk-interface/files/, dev-libs/roct-thunk-interface/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/roct-thunk-interface/Manifest dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch dev-libs/roct-thunk-interface/roct-thunk-interface-2.6.0.ebuild X-VCS-Directories: dev-libs/roct-thunk-interface/ dev-libs/roct-thunk-interface/files/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: fc8f4d08b34d046fb9729c78f25b6e02f09de23d X-VCS-Branch: master Date: Wed, 7 Aug 2019 17:38:52 +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: 88efdb2f-ca60-4c42-8ae7-b599595bdd82 X-Archives-Hash: abb977db80ee2b9277e1fe336bc4f29c commit: fc8f4d08b34d046fb9729c78f25b6e02f09de23d Author: Craig Andrews gentoo org> AuthorDate: Mon Jul 22 20:22:19 2019 +0000 Commit: Craig Andrews gentoo org> CommitDate: Wed Aug 7 17:38:41 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc8f4d08 dev-libs/roct-thunk-interface: 2.6.0 version bump Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Craig Andrews gentoo.org> dev-libs/roct-thunk-interface/Manifest | 1 + ...hunk-interface-2.6.0-correctly-install-pc.patch | 25 +++++++++++++ ...t-thunk-interface-2.6.0-correctly-install.patch | 25 +++++++++++++ .../roct-thunk-interface-2.6.0-pc-prefix.patch | 22 ++++++++++++ .../roct-thunk-interface-2.6.0.ebuild | 41 ++++++++++++++++++++++ 5 files changed, 114 insertions(+) diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest index 5a78b9fd36a..8ba10b79341 100644 --- a/dev-libs/roct-thunk-interface/Manifest +++ b/dev-libs/roct-thunk-interface/Manifest @@ -1 +1,2 @@ DIST roct-thunk-interface-2.0.0.tar.gz 1958218 BLAKE2B c1ba89cac9a18964e040e6b1e57a464216e7086c400e3360cfca6f376ac90b0b1afbb3a2a4d995581d1829ca57afe62bf6f2ac59cc103a48d384a8e52b1457d0 SHA512 7d2e35df2bec201bcc977328d7d36b921f76b57a0c54fc2332eb1faf3a722b6a3a1e3b1658e93b216ed68b965426c463a2dbf52a22af64ce1dcc9fad0f27ca9c +DIST roct-thunk-interface-2.6.0.tar.gz 1957383 BLAKE2B 0335d4e219978d16bc8dbc77c6e1fb315f424ddf9225eb14968d4f8233348b358151f2baf279dc2a6e422da7839b704c847f1311b21d69e07738f3fca3235452 SHA512 e54f7cefa1854fb9967e373bd3ef5a0236987ebb26c21728ef5676e73cf63be6e9a49c1ce52d1156caa970473f214e02f25370e2cd7381c1f74a0b8cd5b2bc7f diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch new file mode 100644 index 00000000000..4d0680415ce --- /dev/null +++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch @@ -0,0 +1,25 @@ +https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/39 + +From 032a3e38c62b84ec56fad70d24cf82ee65d8c80b Mon Sep 17 00:00:00 2001 +From: Craig Andrews +Date: Mon, 22 Jul 2019 17:06:16 -0400 +Subject: [PATCH] Install libhsakmt.pc to the standard location + +pkgconfig files should be installed to /usr/share/pkgconfig/, not /usr/libhsakmt/ +--- + hsakmt-dev.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hsakmt-dev.txt b/hsakmt-dev.txt +index eb0d3e2..195cc6c 100644 +--- a/hsakmt-dev.txt ++++ b/hsakmt-dev.txt +@@ -43,7 +43,7 @@ set ( BUILD_VERSION_PATCH @BUILD_VERSION_PATCH@ ) + set ( CMAKE_VERBOSE_MAKEFILE on ) + + ## Set the install targets +-install ( FILES libhsakmt.pc DESTINATION libhsakmt ) ++install ( FILES libhsakmt.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig ) + install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} ) + + diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch new file mode 100644 index 00000000000..961d2978a2d --- /dev/null +++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch @@ -0,0 +1,25 @@ +https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/38 + +From 1362864410579c35eb2ec428384ad883cb8b24b1 Mon Sep 17 00:00:00 2001 +From: Craig Andrews +Date: Mon, 22 Jul 2019 16:18:08 -0400 +Subject: [PATCH] Install LICENSE.md to DOCDIR + +LICENSE.md should be installed to the DOCDIR, not /usr/libhsakmt +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e020132..398da3e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -145,7 +145,7 @@ add_custom_target ( package-dev DEPENDS build-dev + + ## Add the install directives for the runtime library. + install ( TARGETS ${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +-install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION libhsakmt ) ++install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} ) + + ## Add the packaging directives for the runtime library. + set ( CPACK_PACKAGE_NAME ${HSAKMT_PACKAGE} ) diff --git a/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch new file mode 100644 index 00000000000..0b4a716e6c9 --- /dev/null +++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch @@ -0,0 +1,22 @@ +https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/40 + +From fb42a02230ed5140b3ac3beadb38ca39eb9ea463 Mon Sep 17 00:00:00 2001 +From: Craig Andrews +Date: Mon, 22 Jul 2019 17:17:09 -0400 +Subject: [PATCH] Use CMAKE_INSTALL_PREFIX in pkgconfig + +The location where files are installed is the value to use; the CPACK packaging directory isn't important as the pkgconfig file is used on the system after the package is installed. +--- + libhsakmt.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libhsakmt.pc.in b/libhsakmt.pc.in +index 3093afc..1abb66d 100644 +--- a/libhsakmt.pc.in ++++ b/libhsakmt.pc.in +@@ -1,4 +1,4 @@ +-prefix=@CPACK_PACKAGING_INSTALL_PREFIX@ ++prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} + libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ + includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-2.6.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.6.0.ebuild new file mode 100644 index 00000000000..8968eaaf965 --- /dev/null +++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.6.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils linux-info + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/" + inherit git-r3 +else + SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}" + KEYWORDS="~amd64" +fi +PATCHES=( + "${FILESDIR}/${P}-correctly-install.patch" + "${FILESDIR}/${P}-correctly-install-pc.patch" + "${FILESDIR}/${P}-pc-prefix.patch" +) + +DESCRIPTION="Radeon Open Compute Thunk Interface" +HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface" +CONFIG_CHECK="~HSA_AMD" +LICENSE="MIT" +SLOT="0/$(ver_cut 1-2)" + +RDEPEND="sys-process/numactl + sys-apps/pciutils" +DEPEND="${RDEPEND}" + +src_prepare() { + sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die + cmake-utils_src_prepare +} +src_compile() { + cmake-utils_src_compile build-dev +} +src_install() { + cmake-utils_src_install install-dev +}