1 |
commit: 9174842be92f3840dfb5124f38758c2694a90401 |
2 |
Author: Huang Rui <vowstar <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Nov 3 03:55:43 2022 +0000 |
4 |
Commit: Rui Huang <vowstar <AT> gmail <DOT> com> |
5 |
CommitDate: Thu Nov 3 03:55:43 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9174842b |
7 |
|
8 |
dev-libs/unordered_dense: use patch to fix cmake install path |
9 |
|
10 |
Signed-off-by: Huang Rui <vowstar <AT> gmail.com> |
11 |
|
12 |
...rdered_dense-2.0.0-fix-cmake-install-path.patch | 26 ++++++++++++++++++++++ |
13 |
.../unordered_dense/unordered_dense-2.0.0.ebuild | 12 ++++------ |
14 |
.../unordered_dense/unordered_dense-9999.ebuild | 12 ++++------ |
15 |
3 files changed, 34 insertions(+), 16 deletions(-) |
16 |
|
17 |
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 |
18 |
new file mode 100644 |
19 |
index 000000000..bc7e4b153 |
20 |
--- /dev/null |
21 |
+++ b/dev-libs/unordered_dense/files/unordered_dense-2.0.0-fix-cmake-install-path.patch |
22 |
@@ -0,0 +1,26 @@ |
23 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
24 |
+index e2991bc..16096fc 100644 |
25 |
+--- a/CMakeLists.txt |
26 |
++++ b/CMakeLists.txt |
27 |
+@@ -42,18 +42,18 @@ if(_unordered_dense_is_toplevel_project) |
28 |
+ configure_package_config_file( |
29 |
+ "${PROJECT_SOURCE_DIR}/cmake/unordered_denseConfig.cmake.in" |
30 |
+ "${PROJECT_BINARY_DIR}/unordered_denseConfig.cmake" |
31 |
+- INSTALL_DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/unordered_dense/cmake) |
32 |
++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) |
33 |
+ |
34 |
+ install( |
35 |
+ EXPORT unordered_dense_Targets |
36 |
+ FILE unordered_denseTargets.cmake |
37 |
+ NAMESPACE unordered_dense:: |
38 |
+- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/unordered_dense/cmake) |
39 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) |
40 |
+ |
41 |
+ install( |
42 |
+ FILES "${PROJECT_BINARY_DIR}/unordered_denseConfig.cmake" |
43 |
+ "${PROJECT_BINARY_DIR}/unordered_denseConfigVersion.cmake" |
44 |
+- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/unordered_dense/cmake) |
45 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}) |
46 |
+ |
47 |
+ install( |
48 |
+ DIRECTORY ${PROJECT_SOURCE_DIR}/include/ankerl |
49 |
|
50 |
diff --git a/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild b/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild |
51 |
index 96d0837de..fedb51b2f 100644 |
52 |
--- a/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild |
53 |
+++ b/dev-libs/unordered_dense/unordered_dense-2.0.0.ebuild |
54 |
@@ -28,6 +28,10 @@ DEPEND=" |
55 |
${RDEPEND} |
56 |
" |
57 |
|
58 |
+PATCHES=( |
59 |
+ "${FILESDIR}/${PN}-2.0.0-fix-cmake-install-path.patch" |
60 |
+) |
61 |
+ |
62 |
src_configure() { |
63 |
local mycmakeargs=( |
64 |
-D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" |
65 |
@@ -35,11 +39,3 @@ src_configure() { |
66 |
) |
67 |
cmake_src_configure |
68 |
} |
69 |
- |
70 |
-src_install() { |
71 |
- cmake_src_install |
72 |
- # fix cmake module file install path |
73 |
- mkdir -p "${D}"/usr/"$(get_libdir)"/cmake/"${PN}" || die |
74 |
- mv "${D}"/usr/share/${PN}/cmake/* "${D}"/usr/"$(get_libdir)"/cmake/"${PN}"/ || die |
75 |
- rm -r "${D}"/usr/share/${PN} || die |
76 |
-} |
77 |
|
78 |
diff --git a/dev-libs/unordered_dense/unordered_dense-9999.ebuild b/dev-libs/unordered_dense/unordered_dense-9999.ebuild |
79 |
index 96d0837de..fedb51b2f 100644 |
80 |
--- a/dev-libs/unordered_dense/unordered_dense-9999.ebuild |
81 |
+++ b/dev-libs/unordered_dense/unordered_dense-9999.ebuild |
82 |
@@ -28,6 +28,10 @@ DEPEND=" |
83 |
${RDEPEND} |
84 |
" |
85 |
|
86 |
+PATCHES=( |
87 |
+ "${FILESDIR}/${PN}-2.0.0-fix-cmake-install-path.patch" |
88 |
+) |
89 |
+ |
90 |
src_configure() { |
91 |
local mycmakeargs=( |
92 |
-D CMAKE_INSTALL_LIBDIR="${EPREFIX}/usr/$(get_libdir)" |
93 |
@@ -35,11 +39,3 @@ src_configure() { |
94 |
) |
95 |
cmake_src_configure |
96 |
} |
97 |
- |
98 |
-src_install() { |
99 |
- cmake_src_install |
100 |
- # fix cmake module file install path |
101 |
- mkdir -p "${D}"/usr/"$(get_libdir)"/cmake/"${PN}" || die |
102 |
- mv "${D}"/usr/share/${PN}/cmake/* "${D}"/usr/"$(get_libdir)"/cmake/"${PN}"/ || die |
103 |
- rm -r "${D}"/usr/share/${PN} || die |
104 |
-} |