summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYiyang Wu <xgreenlandforwyy@gmail.com>2022-08-28 13:38:41 +0800
committerBenda Xu <heroxbd@gentoo.org>2022-09-12 16:40:56 +0800
commit0a35da712cb2262ea945f6ef66e03866579b9d14 (patch)
treefa40faa42fa3c95d0dc26b2f9ba65da9a989558d /dev-util
parentprofiles/arch: enable ada USE on x86 and amd64 (diff)
downloadgentoo-0a35da712cb2262ea945f6ef66e03866579b9d14.tar.gz
gentoo-0a35da712cb2262ea945f6ef66e03866579b9d14.tar.bz2
gentoo-0a35da712cb2262ea945f6ef66e03866579b9d14.zip
dev-util/hip: Fix cmake module and install location
${HIP_COMMON_DIR}/cmake, containing FindHIP.cmake, should be installed into /usr/share/cmake/Modules. ${S}/CMakeLists.txt (both 5.{0,1})and ${S}/packaging/CMakeLists.txt (only 5.1) is installing it into /usr/lib/cmake. Cancel installation in packaging/CMakeLists.txt, correct CMakeLists.txt. Signed-off-by: Yiyang Wu <xgreenlandforwyy@gmail.com> Signed-off-by: Benda Xu <heroxbd@gentoo.org>
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/hip/hip-5.0.2-r3.ebuild (renamed from dev-util/hip/hip-5.0.2-r2.ebuild)2
-rw-r--r--dev-util/hip/hip-5.1.3-r1.ebuild (renamed from dev-util/hip/hip-5.1.3.ebuild)4
2 files changed, 3 insertions, 3 deletions
diff --git a/dev-util/hip/hip-5.0.2-r2.ebuild b/dev-util/hip/hip-5.0.2-r3.ebuild
index fd069acfe4b4..15ea58b0895c 100644
--- a/dev-util/hip/hip-5.0.2-r2.ebuild
+++ b/dev-util/hip/hip-5.0.2-r3.ebuild
@@ -74,7 +74,7 @@ src_prepare() {
# correct libs and cmake install dir
sed -e "/LIB_INSTALL_DIR/s:PREFIX}/lib:PREFIX}/$(get_libdir):" \
- -e "/${HIP_COMMON_DIR}\/cmake DESTINATION/s: .): $(get_libdir)):" -i CMakeLists.txt || die
+ -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die
sed -e "/LIBRARY DESTINATION/s:lib:$(get_libdir):" -i src/CMakeLists.txt || die
cd ${HIP_S} || die
diff --git a/dev-util/hip/hip-5.1.3.ebuild b/dev-util/hip/hip-5.1.3-r1.ebuild
index a9e9844fdcc2..634351aead1f 100644
--- a/dev-util/hip/hip-5.1.3.ebuild
+++ b/dev-util/hip/hip-5.1.3-r1.ebuild
@@ -81,12 +81,12 @@ src_prepare() {
# correct libs and cmake install dir
sed -e "/LIB_INSTALL_DIR/s:PREFIX}/lib:PREFIX}/$(get_libdir):" \
- -e "/${HIP_COMMON_DIR}\/cmake DESTINATION/s: .): $(get_libdir)):" -i CMakeLists.txt || die
+ -e "/\${HIP_COMMON_DIR}/s:cmake DESTINATION .):cmake/ DESTINATION share/cmake/Modules):" -i CMakeLists.txt || die
sed -e "/LIBRARY DESTINATION/s:lib:$(get_libdir):" -i src/CMakeLists.txt || die
sed -e "/\.hip/d" \
-e "s,DESTINATION lib,DESTINATION $(get_libdir),g" \
- -e "/\(cmake\|samples\)/s,DESTINATION \.,DESTINATION share,g" \
+ -e "/cmake DESTINATION/d" \
-e "/CPACK_RESOURCE_FILE_LICENSE/d" -i packaging/CMakeLists.txt || die
pushd ${HIP_S} || die