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 C9596138335 for ; Wed, 14 Aug 2019 00:27:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E32C0E0856; Wed, 14 Aug 2019 00:27:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 BFCDEE0856 for ; Wed, 14 Aug 2019 00:27:23 +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 25CE2349AA6 for ; Wed, 14 Aug 2019 00:27:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A19B762 for ; Wed, 14 Aug 2019 00:27:20 +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: <1565742431.2ddd8ac2596276a6c61d056eefdef42b004c713e.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/files/rocr-runtime-2.0.0-cmake-install-paths.patch dev-libs/rocr-runtime/rocr-runtime-2.6.0-r1.ebuild dev-libs/rocr-runtime/rocr-runtime-2.6.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: 2ddd8ac2596276a6c61d056eefdef42b004c713e X-VCS-Branch: master Date: Wed, 14 Aug 2019 00:27:20 +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: d0be3a73-d35f-4737-806e-c1186fcb0832 X-Archives-Hash: 9003710d62721aa1d88749e8ccfa8374 commit: 2ddd8ac2596276a6c61d056eefdef42b004c713e Author: Craig Andrews gentoo org> AuthorDate: Mon Aug 12 14:34:56 2019 +0000 Commit: Craig Andrews gentoo org> CommitDate: Wed Aug 14 00:27:11 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ddd8ac2 dev-libs/rocr-runtime: Install libraries to libdir, not libdir/hsa Installing to libdir (as opposed to a subdirectory) allows the linker to find the libraries Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Craig Andrews gentoo.org> .../rocr-runtime-2.0.0-cmake-install-paths.patch | 34 +++++++++++----------- ...e-2.6.0.ebuild => rocr-runtime-2.6.0-r1.ebuild} | 0 2 files changed, 17 insertions(+), 17 deletions(-) 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 index ece1571ab40..2caeebb2bbb 100644 --- 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 @@ -1,16 +1,16 @@ -From 866c2fbcf1efa3e84e6f25bebc12dc1d4caa4e74 Mon Sep 17 00:00:00 2001 -From: Craig Andrews -Date: Mon, 7 Jan 2019 21:06:14 -0500 -Subject: [PATCH] Correctly install the library into the system +https://github.com/RadeonOpenCompute/ROCR-Runtime/pull/51/ -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" ---- - src/CMakeLists.txt | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) +commit 2d51a6133f32b72f60fba0e95234aee2b63aa682 (HEAD -> patch-6) +Author: Craig Andrews +Date: Mon Jan 7 21:06:14 2019 -0500 -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 37a9b09..e39f3d2 100644 + 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" + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 37a9b09..545f183 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,6 +53,7 @@ project( ${CORE_RUNTIME_TARGET} ) @@ -21,22 +21,22 @@ index 37a9b09..e39f3d2 100644 include ( hsa_common ) ## Find LibElf -@@ -177,14 +178,12 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release ) +@@ -176,15 +177,9 @@ if ( "${CMAKE_BUILD_TYPE}" STREQUAL Release ) + add_custom_command ( TARGET ${CORE_RUNTIME_TARGET} POST_BUILD COMMAND ${CMAKE_STRIP} *.so ) endif () - ## Create symlinks for packaging and install +-## Create symlinks for packaging and install -add_custom_target ( hsa-link ALL WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${CMAKE_COMMAND} -E create_symlink ../hsa/include/hsa hsa-link ) -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 ) -+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 ) - +- ## 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-link DESTINATION include PERMISSIONS OWNER_WRITE OWNER_READ RENAME hsa ) -install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_RUNTIME_LIBRARY}.so-link DESTINATION lib PERMISSIONS OWNER_WRITE OWNER_READ RENAME ${CORE_RUNTIME_LIBRARY}.so ) -+install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/hsa ) ++install ( TARGETS ${CORE_RUNTIME_TARGET} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) +install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hsa ) -+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 ) ## Packaging directives set ( CPACK_PACKAGE_NAME "hsa-rocr-dev" ) + 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 similarity index 100% rename from dev-libs/rocr-runtime/rocr-runtime-2.6.0.ebuild rename to dev-libs/rocr-runtime/rocr-runtime-2.6.0-r1.ebuild