| 1 |
commit: 2ddd8ac2596276a6c61d056eefdef42b004c713e |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 12 14:34:56 2019 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 14 00:27:11 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ddd8ac2 |
| 7 |
|
| 8 |
dev-libs/rocr-runtime: Install libraries to libdir, not libdir/hsa |
| 9 |
|
| 10 |
Installing to libdir (as opposed to a subdirectory) |
| 11 |
allows the linker to find the libraries |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 14 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 15 |
|
| 16 |
.../rocr-runtime-2.0.0-cmake-install-paths.patch | 34 +++++++++++----------- |
| 17 |
...e-2.6.0.ebuild => rocr-runtime-2.6.0-r1.ebuild} | 0 |
| 18 |
2 files changed, 17 insertions(+), 17 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch b/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch |
| 21 |
index ece1571ab40..2caeebb2bbb 100644 |
| 22 |
--- a/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch |
| 23 |
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-2.0.0-cmake-install-paths.patch |
| 24 |
@@ -1,16 +1,16 @@ |
| 25 |
-From 866c2fbcf1efa3e84e6f25bebc12dc1d4caa4e74 Mon Sep 17 00:00:00 2001 |
| 26 |
-From: Craig Andrews <candrews@××××××××××××.com> |
| 27 |
-Date: Mon, 7 Jan 2019 21:06:14 -0500 |
| 28 |
-Subject: [PATCH] Correctly install the library into the system |
| 29 |
+https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/51/ |
| 30 |
|
| 31 |
-Install to standard locations in /usr/{lib,include}/lib (as opposed to /usr/hsa/{lib,include}/hsa) |
| 32 |
-Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR from GNUInstallDirs instead of using "lib" and "include" |
| 33 |
---- |
| 34 |
- src/CMakeLists.txt | 11 +++++------ |
| 35 |
- 1 file changed, 5 insertions(+), 6 deletions(-) |
| 36 |
+commit 2d51a6133f32b72f60fba0e95234aee2b63aa682 (HEAD -> patch-6) |
| 37 |
+Author: Craig Andrews <candrews@××××××××××××.com> |
| 38 |
+Date: Mon Jan 7 21:06:14 2019 -0500 |
| 39 |
|
| 40 |
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| 41 |
-index 37a9b09..e39f3d2 100644 |
| 42 |
+ Correctly install the library into the system |
| 43 |
+ |
| 44 |
+ Install to standard locations in /usr/{lib,include}/lib (as opposed to /usr/hsa/{lib,include}/hsa) |
| 45 |
+ Use CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR from GNUInstallDirs instead of using "lib" and "include" |
| 46 |
+ |
| 47 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 48 |
+index 37a9b09..545f183 100644 |
| 49 |
--- a/CMakeLists.txt |
| 50 |
+++ b/CMakeLists.txt |
| 51 |
@@ -53,6 +53,7 @@ project( ${CORE_RUNTIME_TARGET} ) |
| 52 |
@@ -21,22 +21,22 @@ index 37a9b09..e39f3d2 100644 |
| 53 |
include ( hsa_common ) |
| 54 |
|
| 55 |
## Find LibElf |
| 56 |
-@@ -177,14 +178,12 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release ) |
| 57 |
+@@ -176,15 +177,9 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release ) |
| 58 |
+ add_custom_command ( TARGET ${CORE_RUNTIME_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} *.so ) |
| 59 |
endif () |
| 60 |
|
| 61 |
- ## Create symlinks for packaging and install |
| 62 |
+-## Create symlinks for packaging and install |
| 63 |
-add_custom_target ( hsa-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa-link ) |
| 64 |
-add_custom_target ( ${CORE_RUNTIME_TARGET}.so-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/lib/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}.so-link ) |
| 65 |
-+add_custom_target ( ${CORE_RUNTIME_TARGET}.so-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink hsa/${CORE_RUNTIME_LIBRARY}.so ${CORE_RUNTIME_LIBRARY}.so-link ) |
| 66 |
- |
| 67 |
+- |
| 68 |
## Set install information |
| 69 |
-install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION hsa/lib ) |
| 70 |
-install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION hsa/include/hsa ) |
| 71 |
-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/hsa-link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa ) |
| 72 |
-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}.so-link DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so ) |
| 73 |
-+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/hsa ) |
| 74 |
++install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) |
| 75 |
+install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa ) |
| 76 |
-+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}.so-link DESTINATION ${CMAKE_INSTALL_LIBDIR} PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so ) |
| 77 |
|
| 78 |
## Packaging directives |
| 79 |
set ( CPACK_PACKAGE_NAME "hsa-rocr-dev" ) |
| 80 |
+ |
| 81 |
|
| 82 |
diff --git a/dev-libs/rocr-runtime/rocr-runtime-2.6.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-2.6.0-r1.ebuild |
| 83 |
similarity index 100% |
| 84 |
rename from dev-libs/rocr-runtime/rocr-runtime-2.6.0.ebuild |
| 85 |
rename to dev-libs/rocr-runtime/rocr-runtime-2.6.0-r1.ebuild |
Archives