1 |
commit: fc8f4d08b34d046fb9729c78f25b6e02f09de23d |
2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 22 20:22:19 2019 +0000 |
4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 7 17:38:41 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc8f4d08 |
7 |
|
8 |
dev-libs/roct-thunk-interface: 2.6.0 version bump |
9 |
|
10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
11 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
12 |
|
13 |
dev-libs/roct-thunk-interface/Manifest | 1 + |
14 |
...hunk-interface-2.6.0-correctly-install-pc.patch | 25 +++++++++++++ |
15 |
...t-thunk-interface-2.6.0-correctly-install.patch | 25 +++++++++++++ |
16 |
.../roct-thunk-interface-2.6.0-pc-prefix.patch | 22 ++++++++++++ |
17 |
.../roct-thunk-interface-2.6.0.ebuild | 41 ++++++++++++++++++++++ |
18 |
5 files changed, 114 insertions(+) |
19 |
|
20 |
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest |
21 |
index 5a78b9fd36a..8ba10b79341 100644 |
22 |
--- a/dev-libs/roct-thunk-interface/Manifest |
23 |
+++ b/dev-libs/roct-thunk-interface/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST roct-thunk-interface-2.0.0.tar.gz 1958218 BLAKE2B c1ba89cac9a18964e040e6b1e57a464216e7086c400e3360cfca6f376ac90b0b1afbb3a2a4d995581d1829ca57afe62bf6f2ac59cc103a48d384a8e52b1457d0 SHA512 7d2e35df2bec201bcc977328d7d36b921f76b57a0c54fc2332eb1faf3a722b6a3a1e3b1658e93b216ed68b965426c463a2dbf52a22af64ce1dcc9fad0f27ca9c |
26 |
+DIST roct-thunk-interface-2.6.0.tar.gz 1957383 BLAKE2B 0335d4e219978d16bc8dbc77c6e1fb315f424ddf9225eb14968d4f8233348b358151f2baf279dc2a6e422da7839b704c847f1311b21d69e07738f3fca3235452 SHA512 e54f7cefa1854fb9967e373bd3ef5a0236987ebb26c21728ef5676e73cf63be6e9a49c1ce52d1156caa970473f214e02f25370e2cd7381c1f74a0b8cd5b2bc7f |
27 |
|
28 |
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 |
29 |
new file mode 100644 |
30 |
index 00000000000..4d0680415ce |
31 |
--- /dev/null |
32 |
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install-pc.patch |
33 |
@@ -0,0 +1,25 @@ |
34 |
+https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/39 |
35 |
+ |
36 |
+From 032a3e38c62b84ec56fad70d24cf82ee65d8c80b Mon Sep 17 00:00:00 2001 |
37 |
+From: Craig Andrews <candrews@××××××××××××.com> |
38 |
+Date: Mon, 22 Jul 2019 17:06:16 -0400 |
39 |
+Subject: [PATCH] Install libhsakmt.pc to the standard location |
40 |
+ |
41 |
+pkgconfig files should be installed to /usr/share/pkgconfig/, not /usr/libhsakmt/ |
42 |
+--- |
43 |
+ hsakmt-dev.txt | 2 +- |
44 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
45 |
+ |
46 |
+diff --git a/hsakmt-dev.txt b/hsakmt-dev.txt |
47 |
+index eb0d3e2..195cc6c 100644 |
48 |
+--- a/hsakmt-dev.txt |
49 |
++++ b/hsakmt-dev.txt |
50 |
+@@ -43,7 +43,7 @@ set ( BUILD_VERSION_PATCH @BUILD_VERSION_PATCH@ ) |
51 |
+ set ( CMAKE_VERBOSE_MAKEFILE on ) |
52 |
+ |
53 |
+ ## Set the install targets |
54 |
+-install ( FILES libhsakmt.pc DESTINATION libhsakmt ) |
55 |
++install ( FILES libhsakmt.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig ) |
56 |
+ install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} ) |
57 |
+ |
58 |
+ |
59 |
|
60 |
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 |
61 |
new file mode 100644 |
62 |
index 00000000000..961d2978a2d |
63 |
--- /dev/null |
64 |
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-correctly-install.patch |
65 |
@@ -0,0 +1,25 @@ |
66 |
+https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/38 |
67 |
+ |
68 |
+From 1362864410579c35eb2ec428384ad883cb8b24b1 Mon Sep 17 00:00:00 2001 |
69 |
+From: Craig Andrews <candrews@××××××××××××.com> |
70 |
+Date: Mon, 22 Jul 2019 16:18:08 -0400 |
71 |
+Subject: [PATCH] Install LICENSE.md to DOCDIR |
72 |
+ |
73 |
+LICENSE.md should be installed to the DOCDIR, not /usr/libhsakmt |
74 |
+--- |
75 |
+ CMakeLists.txt | 2 +- |
76 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
77 |
+ |
78 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
79 |
+index e020132..398da3e 100644 |
80 |
+--- a/CMakeLists.txt |
81 |
++++ b/CMakeLists.txt |
82 |
+@@ -145,7 +145,7 @@ add_custom_target ( package-dev DEPENDS build-dev |
83 |
+ |
84 |
+ ## Add the install directives for the runtime library. |
85 |
+ install ( TARGETS ${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_LIBDIR} ) |
86 |
+-install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION libhsakmt ) |
87 |
++install ( FILES ${SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} ) |
88 |
+ |
89 |
+ ## Add the packaging directives for the runtime library. |
90 |
+ set ( CPACK_PACKAGE_NAME ${HSAKMT_PACKAGE} ) |
91 |
|
92 |
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 |
93 |
new file mode 100644 |
94 |
index 00000000000..0b4a716e6c9 |
95 |
--- /dev/null |
96 |
+++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-pc-prefix.patch |
97 |
@@ -0,0 +1,22 @@ |
98 |
+https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/40 |
99 |
+ |
100 |
+From fb42a02230ed5140b3ac3beadb38ca39eb9ea463 Mon Sep 17 00:00:00 2001 |
101 |
+From: Craig Andrews <candrews@××××××××××××.com> |
102 |
+Date: Mon, 22 Jul 2019 17:17:09 -0400 |
103 |
+Subject: [PATCH] Use CMAKE_INSTALL_PREFIX in pkgconfig |
104 |
+ |
105 |
+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. |
106 |
+--- |
107 |
+ libhsakmt.pc.in | 2 +- |
108 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
109 |
+ |
110 |
+diff --git a/libhsakmt.pc.in b/libhsakmt.pc.in |
111 |
+index 3093afc..1abb66d 100644 |
112 |
+--- a/libhsakmt.pc.in |
113 |
++++ b/libhsakmt.pc.in |
114 |
+@@ -1,4 +1,4 @@ |
115 |
+-prefix=@CPACK_PACKAGING_INSTALL_PREFIX@ |
116 |
++prefix=@CMAKE_INSTALL_PREFIX@ |
117 |
+ exec_prefix=${prefix} |
118 |
+ libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
119 |
+ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ |
120 |
|
121 |
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 |
122 |
new file mode 100644 |
123 |
index 00000000000..8968eaaf965 |
124 |
--- /dev/null |
125 |
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-2.6.0.ebuild |
126 |
@@ -0,0 +1,41 @@ |
127 |
+# Copyright 1999-2019 Gentoo Authors |
128 |
+# Distributed under the terms of the GNU General Public License v2 |
129 |
+ |
130 |
+EAPI=7 |
131 |
+ |
132 |
+inherit cmake-utils linux-info |
133 |
+ |
134 |
+if [[ ${PV} == *9999 ]] ; then |
135 |
+ EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/" |
136 |
+ inherit git-r3 |
137 |
+else |
138 |
+ SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz" |
139 |
+ S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}" |
140 |
+ KEYWORDS="~amd64" |
141 |
+fi |
142 |
+PATCHES=( |
143 |
+ "${FILESDIR}/${P}-correctly-install.patch" |
144 |
+ "${FILESDIR}/${P}-correctly-install-pc.patch" |
145 |
+ "${FILESDIR}/${P}-pc-prefix.patch" |
146 |
+) |
147 |
+ |
148 |
+DESCRIPTION="Radeon Open Compute Thunk Interface" |
149 |
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface" |
150 |
+CONFIG_CHECK="~HSA_AMD" |
151 |
+LICENSE="MIT" |
152 |
+SLOT="0/$(ver_cut 1-2)" |
153 |
+ |
154 |
+RDEPEND="sys-process/numactl |
155 |
+ sys-apps/pciutils" |
156 |
+DEPEND="${RDEPEND}" |
157 |
+ |
158 |
+src_prepare() { |
159 |
+ sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die |
160 |
+ cmake-utils_src_prepare |
161 |
+} |
162 |
+src_compile() { |
163 |
+ cmake-utils_src_compile build-dev |
164 |
+} |
165 |
+src_install() { |
166 |
+ cmake-utils_src_install install-dev |
167 |
+} |