diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-08-18 18:16:17 +0100 |
commit | fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch) | |
tree | 326613a08f25851c388715e205576a2e7d25dc4f /dev-libs/roct-thunk-interface/files | |
parent | b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff) |
gentoo resync : 18.08.2019
Diffstat (limited to 'dev-libs/roct-thunk-interface/files')
4 files changed, 97 insertions, 0 deletions
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 000000000000..4d0680415ce1 --- /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 <candrews@integralblue.com> +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 000000000000..961d2978a2d1 --- /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 <candrews@integralblue.com> +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-do-not-install-kfd_ioctl.h.patch b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-do-not-install-kfd_ioctl.h.patch new file mode 100644 index 000000000000..711c16f852e0 --- /dev/null +++ b/dev-libs/roct-thunk-interface/files/roct-thunk-interface-2.6.0-do-not-install-kfd_ioctl.h.patch @@ -0,0 +1,25 @@ +https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/pull/42 + +From 9090559aad755bf2b5041fb617c3ddf790c7cdf6 Mon Sep 17 00:00:00 2001 +From: Craig Andrews <candrews@integralblue.com> +Date: Thu, 8 Aug 2019 14:01:04 -0400 +Subject: [PATCH] hsakmt-dev should not install linux kernel headers + +hsakmt-dev should not install include/linux/* (currently just kfd_ioctl.h) as those are linux kernel headers provided by the linux kernel header packages (`linux-headers-*` on Debian/Ubuntu or `kernel-headers-*` on Red Hat / Fedora) +--- + hsakmt-dev.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hsakmt-dev.txt b/hsakmt-dev.txt +index eb0d3e2..6af364c 100644 +--- a/hsakmt-dev.txt ++++ b/hsakmt-dev.txt +@@ -44,7 +44,7 @@ set ( CMAKE_VERBOSE_MAKEFILE on ) + + ## Set the install targets + install ( FILES libhsakmt.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig ) +-install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} ) ++install ( DIRECTORY ${SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_COMPONENT} PATTERN "linux" EXCLUDE ) + + + ## Set the default generator types for the devel 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 000000000000..0b4a716e6c9d --- /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 <candrews@integralblue.com> +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@ |