| 1 |
commit: a762bf47f145488ae284c1601e253320f336fb3d |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 25 21:07:30 2020 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 25 21:08:08 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a762bf47 |
| 7 |
|
| 8 |
dev-libs/rocr-runtime: Remove USE="non-free" |
| 9 |
|
| 10 |
Upstream no longer publishes the dev-libs/hsa-ext-rocr library. |
| 11 |
ROC has had open-source OpenCL image support since 3.3. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/716930 |
| 14 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 15 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 16 |
|
| 17 |
dev-libs/rocr-runtime/metadata.xml | 3 --- |
| 18 |
dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild | 4 +--- |
| 19 |
dev-libs/rocr-runtime/rocr-runtime-9999.ebuild | 19 +++++++++++++++---- |
| 20 |
3 files changed, 16 insertions(+), 10 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-libs/rocr-runtime/metadata.xml b/dev-libs/rocr-runtime/metadata.xml |
| 23 |
index e13e7321708..d53b83185ad 100644 |
| 24 |
--- a/dev-libs/rocr-runtime/metadata.xml |
| 25 |
+++ b/dev-libs/rocr-runtime/metadata.xml |
| 26 |
@@ -15,7 +15,4 @@ |
| 27 |
<longdescription lang="en"> |
| 28 |
Radeon Open Compute Platform Runtime |
| 29 |
</longdescription> |
| 30 |
- <use> |
| 31 |
- <flag name="non-free">Enables HSA image support using <pkg>dev-libs/hsa-ext-rocr</pkg></flag> |
| 32 |
- </use> |
| 33 |
</pkgmetadata> |
| 34 |
|
| 35 |
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild |
| 36 |
index 064969d47e2..d69d702b2de 100644 |
| 37 |
--- a/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild |
| 38 |
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.7.0.ebuild |
| 39 |
@@ -23,11 +23,9 @@ PATCHES=( |
| 40 |
|
| 41 |
LICENSE="MIT" |
| 42 |
SLOT="0/$(ver_cut 1-2)" |
| 43 |
-IUSE="non-free" |
| 44 |
|
| 45 |
COMMON_DEPEND="sys-process/numactl" |
| 46 |
-RDEPEND="${COMMON_DEPEND} |
| 47 |
- non-free? ( dev-libs/hsa-ext-rocr )" |
| 48 |
+RDEPEND="${COMMON_DEPEND}" |
| 49 |
DEPEND="${COMMON_DEPEND} |
| 50 |
>=dev-libs/roct-thunk-interface-${PV} |
| 51 |
>=dev-libs/rocm-device-libs-${PV} |
| 52 |
|
| 53 |
diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild |
| 54 |
index 5ddab400ad0..d69d702b2de 100644 |
| 55 |
--- a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild |
| 56 |
+++ b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild |
| 57 |
@@ -17,18 +17,29 @@ fi |
| 58 |
|
| 59 |
DESCRIPTION="Radeon Open Compute Runtime" |
| 60 |
HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime" |
| 61 |
+PATCHES=( |
| 62 |
+ "${FILESDIR}/${PN}-3.7.0-cmake-install-paths.patch" |
| 63 |
+) |
| 64 |
|
| 65 |
LICENSE="MIT" |
| 66 |
SLOT="0/$(ver_cut 1-2)" |
| 67 |
-IUSE="non-free" |
| 68 |
|
| 69 |
COMMON_DEPEND="sys-process/numactl" |
| 70 |
-RDEPEND="${COMMON_DEPEND} |
| 71 |
- non-free? ( dev-libs/hsa-ext-rocr )" |
| 72 |
+RDEPEND="${COMMON_DEPEND}" |
| 73 |
DEPEND="${COMMON_DEPEND} |
| 74 |
- >=dev-libs/roct-thunk-interface-${PV}" |
| 75 |
+ >=dev-libs/roct-thunk-interface-${PV} |
| 76 |
+ >=dev-libs/rocm-device-libs-${PV} |
| 77 |
+ app-editors/vim-core" |
| 78 |
+ # vim-core is needed for "xxd" |
| 79 |
|
| 80 |
src_prepare() { |
| 81 |
sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die |
| 82 |
+ |
| 83 |
+ # ... otherwise system llvm/clang is used ... |
| 84 |
+ sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die |
| 85 |
+ |
| 86 |
+ # Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ... |
| 87 |
+ sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib:" -i image/blit_src/CMakeLists.txt || die |
| 88 |
+ |
| 89 |
cmake_src_prepare |
| 90 |
} |
Archives