From 9174842be92f3840dfb5124f38758c2694a90401 Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Thu, 3 Nov 2022 11:55:43 +0800 Subject: [PATCH] dev-libs/unordered_dense: use patch to fix cmake install path Signed-off-by: Huang Rui --- ...d_dense-2.0.0-fix-cmake-install-path.patch | 26 +++++++++++++++++++ .../unordered_dense-2.0.0.ebuild | 12 +++------ .../unordered_dense-9999.ebuild | 12 +++------ 3 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 dev-libs/unordered_dense/files/unordered_dense-2.0.0-fix-cmake-install-path.patch diff --git a/dev-libs/unordered_dense/files/unordered_dense-2.0.0-fix-cmake-install-path.patch b/dev-libs/unordered_dense/files/unordered_dense-2.0.0-fix-cmake-install-path.patch new file mode 100644 index 0000000000..bc7e4b1537 --- /dev/null +++ b/dev-libs/unordered_dense/files/unordered_dense-2.0.0-fix-cmake-install-path.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e2991bc..16096fc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,18 +42,18 @@ if(_unordered_dense_is_toplevel_project) + configure_package_config_file( + "${PROJECT_SOURCE_DIR}/cmake/unordered_denseConfig.cmake.in" + "${PROJECT_BINARY_DIR}/unordered_denseConfig.cmake" +- INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/unordered_dense/cmake) ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) + + install( + EXPORT unordered_dense_Targets + FILE unordered_denseTargets.cmake + NAMESPACE unordered_dense:: +- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/unordered_dense/cmake) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) + + install( + FILES "${PROJECT_BINARY_DIR}/unordered_denseConfig.cmake" + "${PROJECT_BINARY_DIR}/unordered_denseConfigVersion.cmake" +- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/unordered_dense/cmake) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) + + install( + DIRECTORY ${PROJECT_SOURCE_DIR}/include/ankerl diff --git a/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild b/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild index 96d0837dec..fedb51b2f2 100644 --- a/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild +++ b/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild @@ -28,6 +28,10 @@ DEPEND=" ${RDEPEND} " +PATCHES=( + "${FILESDIR}/${PN}-2.0.0-fix-cmake-install-path.patch" +) + src_configure() { local mycmakeargs=( -D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" @@ -35,11 +39,3 @@ src_configure() { ) cmake_src_configure } - -src_install() { - cmake_src_install - # fix cmake module file install path - mkdir -p "${D}"/usr/"$(get_libdir)"/cmake/"${PN}" || die - mv "${D}"/usr/share/${PN}/cmake/* "${D}"/usr/"$(get_libdir)"/cmake/"${PN}"/ || die - rm -r "${D}"/usr/share/${PN} || die -} diff --git a/dev-libs/unordered_dense/unordered_dense-9999.ebuild b/dev-libs/unordered_dense/unordered_dense-9999.ebuild index 96d0837dec..fedb51b2f2 100644 --- a/dev-libs/unordered_dense/unordered_dense-9999.ebuild +++ b/dev-libs/unordered_dense/unordered_dense-9999.ebuild @@ -28,6 +28,10 @@ DEPEND=" ${RDEPEND} " +PATCHES=( + "${FILESDIR}/${PN}-2.0.0-fix-cmake-install-path.patch" +) + src_configure() { local mycmakeargs=( -D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" @@ -35,11 +39,3 @@ src_configure() { ) cmake_src_configure } - -src_install() { - cmake_src_install - # fix cmake module file install path - mkdir -p "${D}"/usr/"$(get_libdir)"/cmake/"${PN}" || die - mv "${D}"/usr/share/${PN}/cmake/* "${D}"/usr/"$(get_libdir)"/cmake/"${PN}"/ || die - rm -r "${D}"/usr/share/${PN} || die -}