1 |
commit: c7800fed27e6e871a64ff5469b98e66330028906 |
2 |
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 30 18:15:48 2016 +0000 |
4 |
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 30 18:17:26 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7800fed |
7 |
|
8 |
dev-libs/caliper: initial commit |
9 |
|
10 |
This includes patches from LLNL/Caliper#23, LLNL/Caliper#24 and |
11 |
LLNL/Caliper#25 |
12 |
|
13 |
Package-Manager: portage-2.3.0 |
14 |
|
15 |
dev-libs/caliper/Manifest | 1 + |
16 |
dev-libs/caliper/caliper-1.5.0.ebuild | 33 +++ |
17 |
dev-libs/caliper/files/caliper-1.5.0-cmake.patch | 33 +++ |
18 |
.../caliper/files/caliper-1.5.0-multilib.patch | 271 +++++++++++++++++++++ |
19 |
dev-libs/caliper/files/caliper-1.5.0-python2.patch | 22 ++ |
20 |
dev-libs/caliper/metadata.xml | 11 + |
21 |
6 files changed, 371 insertions(+) |
22 |
|
23 |
diff --git a/dev-libs/caliper/Manifest b/dev-libs/caliper/Manifest |
24 |
new file mode 100644 |
25 |
index 00000000..931bab8 |
26 |
--- /dev/null |
27 |
+++ b/dev-libs/caliper/Manifest |
28 |
@@ -0,0 +1 @@ |
29 |
+DIST caliper-1.5.0.tar.gz 167184 SHA256 f6580f88a2bc500590a3412ecc3e8fe245a03f111aef129cd1ac9d55a31fca93 SHA512 8f54d453efc4a1d3b6ef5cfd9c07726813850942c694378ebcf03dd9dfb390c67473ff621627cc78209b811e9591e6c8542697dbc23ee05ceef3a1fb8af2bb4e WHIRLPOOL 8a8d92cf1c4ff66a2b4181939ff9519227c3f8c4f92cc9ee395ff7d61bb224144efb94c2f3c88b74af495773dece3771e5b1295321ba48435721f545903c984c |
30 |
|
31 |
diff --git a/dev-libs/caliper/caliper-1.5.0.ebuild b/dev-libs/caliper/caliper-1.5.0.ebuild |
32 |
new file mode 100644 |
33 |
index 00000000..006b140 |
34 |
--- /dev/null |
35 |
+++ b/dev-libs/caliper/caliper-1.5.0.ebuild |
36 |
@@ -0,0 +1,33 @@ |
37 |
+# Copyright 1999-2016 Gentoo Foundation |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+# $Id$ |
40 |
+ |
41 |
+EAPI=6 |
42 |
+ |
43 |
+inherit cmake-utils |
44 |
+ |
45 |
+DESCRIPTION="Application Introspection System" |
46 |
+HOMEPAGE="http://computation.llnl.gov/projects/caliper" |
47 |
+SRC_URI="https://github.com/LLNL/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
48 |
+ |
49 |
+LICENSE="BSD" |
50 |
+SLOT="0" |
51 |
+KEYWORDS="~amd64 ~x86" |
52 |
+IUSE="" |
53 |
+ |
54 |
+DEPEND=" |
55 |
+ net-misc/curl |
56 |
+ sys-libs/libunwind |
57 |
+ dev-libs/papi |
58 |
+ " |
59 |
+RDEPEND="${DEPEND}" |
60 |
+ |
61 |
+#thttps://github.com/LLNL/Caliper/pull/23 |
62 |
+#thttps://github.com/LLNL/Caliper/pull/24 |
63 |
+#thttps://github.com/LLNL/Caliper/pull/25 |
64 |
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" |
65 |
+ "${FILESDIR}/${P}-python2.patch" |
66 |
+ "${FILESDIR}/${P}-multilib.patch" |
67 |
+ ) |
68 |
+ |
69 |
+S="${WORKDIR}/${P^c}" |
70 |
|
71 |
diff --git a/dev-libs/caliper/files/caliper-1.5.0-cmake.patch b/dev-libs/caliper/files/caliper-1.5.0-cmake.patch |
72 |
new file mode 100644 |
73 |
index 00000000..88a1427 |
74 |
--- /dev/null |
75 |
+++ b/dev-libs/caliper/files/caliper-1.5.0-cmake.patch |
76 |
@@ -0,0 +1,33 @@ |
77 |
+From f3f634a7e3eb76c8206739a362d3926e8a5ff1d7 Mon Sep 17 00:00:00 2001 |
78 |
+From: Christoph Junghans <junghans@××××.gov> |
79 |
+Date: Wed, 30 Nov 2016 10:12:31 -0700 |
80 |
+Subject: [PATCH] FindLibcurl.cmake: add path suffix |
81 |
+ |
82 |
+Most linux distros put curl.h in a subdir curl |
83 |
+--- |
84 |
+ cmake/FindLibcurl.cmake | 4 ++-- |
85 |
+ 1 file changed, 2 insertions(+), 2 deletions(-) |
86 |
+ |
87 |
+diff --git a/cmake/FindLibcurl.cmake b/cmake/FindLibcurl.cmake |
88 |
+index c3dcce1..ad0ac5b 100644 |
89 |
+--- a/cmake/FindLibcurl.cmake |
90 |
++++ b/cmake/FindLibcurl.cmake |
91 |
+@@ -1,7 +1,7 @@ |
92 |
+ # |
93 |
+ # - Find libcurl |
94 |
+ # |
95 |
+-# LIBCURL_INCLUDE_DIR - Path to libcurl.h |
96 |
++# LIBCURL_INCLUDE_DIR - Path to curl.h |
97 |
+ # LIBCURL_LIBRARY - List of libraries for using libcurl |
98 |
+ # LIBCURL_FOUND - True if libcurl was found |
99 |
+ |
100 |
+@@ -9,8 +9,8 @@ if(LIBCURL_INCLUDE_DIR) |
101 |
+ set(LIBCURL_FIND_QUIETLY true) |
102 |
+ endif() |
103 |
+ |
104 |
+-find_path(LIBCURL_INCLUDE_DIR curl.h) |
105 |
+ find_library(LIBCURL_LIBRARY curl) |
106 |
++find_path(LIBCURL_INCLUDE_DIR curl.h PATH_SUFFIXES curl) |
107 |
+ |
108 |
+ include(FindPackageHandleStandardArgs) |
109 |
+ find_package_handle_standard_args(Libcurl DEFAULT_MSG LIBCURL_LIBRARY LIBCURL_INCLUDE_DIR) |
110 |
|
111 |
diff --git a/dev-libs/caliper/files/caliper-1.5.0-multilib.patch b/dev-libs/caliper/files/caliper-1.5.0-multilib.patch |
112 |
new file mode 100644 |
113 |
index 00000000..4df5d84 |
114 |
--- /dev/null |
115 |
+++ b/dev-libs/caliper/files/caliper-1.5.0-multilib.patch |
116 |
@@ -0,0 +1,271 @@ |
117 |
+From b296fb1d9db532a14c815d6e90ec606a32f570be Mon Sep 17 00:00:00 2001 |
118 |
+From: Christoph Junghans <junghans@××××.gov> |
119 |
+Date: Wed, 30 Nov 2016 11:01:58 -0700 |
120 |
+Subject: [PATCH] cmake: add multilib support |
121 |
+ |
122 |
+--- |
123 |
+ CMakeLists.txt | 13 ++++++++----- |
124 |
+ src/caliper-stub/CMakeLists.txt | 8 ++++---- |
125 |
+ src/caliper/CMakeLists.txt | 6 +++--- |
126 |
+ src/common/CMakeLists.txt | 8 ++++---- |
127 |
+ src/common/csv/CMakeLists.txt | 2 +- |
128 |
+ src/fortran/CMakeLists.txt | 2 +- |
129 |
+ src/reader/CMakeLists.txt | 6 +++--- |
130 |
+ src/services/callpath/CMakeLists.txt | 2 +- |
131 |
+ src/services/mpiwrap/CMakeLists.txt | 4 ++-- |
132 |
+ src/services/ompt/CMakeLists.txt | 2 +- |
133 |
+ src/services/papi/CMakeLists.txt | 2 +- |
134 |
+ src/services/recorder/CMakeLists.txt | 2 +- |
135 |
+ src/tools/cali-graph/CMakeLists.txt | 2 +- |
136 |
+ src/tools/cali-query/CMakeLists.txt | 2 +- |
137 |
+ src/tools/cali-stat/CMakeLists.txt | 2 +- |
138 |
+ src/tools/util/CMakeLists.txt | 6 +++--- |
139 |
+ 16 files changed, 36 insertions(+), 33 deletions(-) |
140 |
+ |
141 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
142 |
+index 3088112..e3e2384 100644 |
143 |
+--- a/CMakeLists.txt |
144 |
++++ b/CMakeLists.txt |
145 |
+@@ -16,6 +16,9 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}") |
146 |
+ include(FindLibunwind) |
147 |
+ include(FindPAPI) |
148 |
+ include(FindLibcurl) |
149 |
++ |
150 |
++include(GNUInstallDirs) |
151 |
++ |
152 |
+ # Optional Fortran |
153 |
+ option(WITH_FORTRAN "Install Fortran interface and build test programs") |
154 |
+ |
155 |
+@@ -131,15 +134,15 @@ configure_file( |
156 |
+ @ONLY) |
157 |
+ |
158 |
+ install(FILES ${PROJECT_BINARY_DIR}/caliper-config.cmake |
159 |
+- DESTINATION share/cmake/caliper) |
160 |
++ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/caliper) |
161 |
+ install(EXPORT caliper |
162 |
+- DESTINATION share/cmake/caliper) |
163 |
++ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake/caliper) |
164 |
+ |
165 |
+ install(FILES ${PROJECT_BINARY_DIR}/caliper-config.h |
166 |
+- DESTINATION include/caliper) |
167 |
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caliper) |
168 |
+ |
169 |
+ install(FILES ${PROJECT_BINARY_DIR}/caliper.pc |
170 |
+- DESTINATION share/pkgconfig) |
171 |
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) |
172 |
+ |
173 |
+ add_subdirectory(src) |
174 |
+ if (WITH_TESTS) |
175 |
+@@ -149,4 +152,4 @@ endif() |
176 |
+ add_subdirectory(doc) |
177 |
+ |
178 |
+ # Install exports |
179 |
+-#install(EXPORT caliper DESTINATION lib/cmake) |
180 |
++#install(EXPORT caliper DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) |
181 |
+diff --git a/src/caliper-stub/CMakeLists.txt b/src/caliper-stub/CMakeLists.txt |
182 |
+index b796f47..d168875 100644 |
183 |
+--- a/src/caliper-stub/CMakeLists.txt |
184 |
++++ b/src/caliper-stub/CMakeLists.txt |
185 |
+@@ -12,9 +12,9 @@ add_library(caliper-stub ${CALIPER_STUB_CXX_SOURCES}) |
186 |
+ |
187 |
+ install(TARGETS caliper-stub-c |
188 |
+ EXPORT caliper-stub-c |
189 |
+- ARCHIVE DESTINATION lib |
190 |
+- LIBRARY DESTINATION lib) |
191 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
192 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
193 |
+ install(TARGETS caliper-stub |
194 |
+ EXPORT caliper-stub |
195 |
+- ARCHIVE DESTINATION lib |
196 |
+- LIBRARY DESTINATION lib) |
197 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
198 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
199 |
+diff --git a/src/caliper/CMakeLists.txt b/src/caliper/CMakeLists.txt |
200 |
+index 4c25990..38b58ac 100644 |
201 |
+--- a/src/caliper/CMakeLists.txt |
202 |
++++ b/src/caliper/CMakeLists.txt |
203 |
+@@ -26,9 +26,9 @@ foreach (_extlib ${CALIPER_EXTERNAL_LIBS}) |
204 |
+ target_link_libraries(caliper ${_extlib}) |
205 |
+ endforeach() |
206 |
+ |
207 |
+-install(FILES ${CALIPER_HEADERS} DESTINATION include/caliper) |
208 |
++install(FILES ${CALIPER_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caliper) |
209 |
+ |
210 |
+ install(TARGETS caliper |
211 |
+ EXPORT caliper |
212 |
+- ARCHIVE DESTINATION lib |
213 |
+- LIBRARY DESTINATION lib) |
214 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
215 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
216 |
+diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt |
217 |
+index 73666fb..0c0b441 100644 |
218 |
+--- a/src/common/CMakeLists.txt |
219 |
++++ b/src/common/CMakeLists.txt |
220 |
+@@ -36,10 +36,10 @@ add_library(caliper-common |
221 |
+ $<TARGET_OBJECTS:c-util> |
222 |
+ ${CALIPER_COMMON_SOURCES}) |
223 |
+ |
224 |
+-install(FILES ${CALIPER_COMMON_HEADERS} DESTINATION include/caliper) |
225 |
+-install(FILES ${CALIPER_UTIL_HEADERS} DESTINATION include/caliper/util) |
226 |
++install(FILES ${CALIPER_COMMON_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caliper) |
227 |
++install(FILES ${CALIPER_UTIL_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caliper/util) |
228 |
+ |
229 |
+ install(TARGETS caliper-common |
230 |
+ EXPORT caliper |
231 |
+- ARCHIVE DESTINATION lib |
232 |
+- LIBRARY DESTINATION lib) |
233 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
234 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
235 |
+diff --git a/src/common/csv/CMakeLists.txt b/src/common/csv/CMakeLists.txt |
236 |
+index ef4357a..1f6f506 100644 |
237 |
+--- a/src/common/csv/CMakeLists.txt |
238 |
++++ b/src/common/csv/CMakeLists.txt |
239 |
+@@ -13,5 +13,5 @@ if (${BUILD_SHARED_LIBS}) |
240 |
+ set_property(TARGET caliper-csv PROPERTY POSITION_INDEPENDENT_CODE TRUE) |
241 |
+ endif() |
242 |
+ |
243 |
+-install(FILES ${CALIPER_CSV_HEADERS} DESTINATION include/caliper/csv) |
244 |
++install(FILES ${CALIPER_CSV_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caliper/csv) |
245 |
+ |
246 |
+diff --git a/src/fortran/CMakeLists.txt b/src/fortran/CMakeLists.txt |
247 |
+index c81323c..9c57f47 100644 |
248 |
+--- a/src/fortran/CMakeLists.txt |
249 |
++++ b/src/fortran/CMakeLists.txt |
250 |
+@@ -6,4 +6,4 @@ set_target_properties(testf03 PROPERTIES LINKER_LANGUAGE CXX) |
251 |
+ |
252 |
+ target_link_libraries(testf03 caliper) |
253 |
+ |
254 |
+-install(FILES caliper.f90 DESTINATION share/fortran) |
255 |
++install(FILES caliper.f90 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/fortran) |
256 |
+diff --git a/src/reader/CMakeLists.txt b/src/reader/CMakeLists.txt |
257 |
+index 5d23d24..3ca79b9 100644 |
258 |
+--- a/src/reader/CMakeLists.txt |
259 |
++++ b/src/reader/CMakeLists.txt |
260 |
+@@ -21,9 +21,9 @@ add_library(caliper-reader ${CALIPER_READER_SOURCES}) |
261 |
+ |
262 |
+ target_link_libraries(caliper-reader caliper-common) |
263 |
+ |
264 |
+-install(FILES ${CALIPER_READER_HEADERS} DESTINATION include/caliper) |
265 |
++install(FILES ${CALIPER_READER_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caliper) |
266 |
+ |
267 |
+ install(TARGETS caliper-reader |
268 |
+ EXPORT caliper |
269 |
+- ARCHIVE DESTINATION lib |
270 |
+- LIBRARY DESTINATION lib) |
271 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
272 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
273 |
+diff --git a/src/services/callpath/CMakeLists.txt b/src/services/callpath/CMakeLists.txt |
274 |
+index dd47570..1f49f36 100644 |
275 |
+--- a/src/services/callpath/CMakeLists.txt |
276 |
++++ b/src/services/callpath/CMakeLists.txt |
277 |
+@@ -3,7 +3,7 @@ include_directories(${LIBUNWIND_INCLUDE_DIR}) |
278 |
+ set(CALIPER_CALLPATH_SOURCES |
279 |
+ Callpath.cpp) |
280 |
+ |
281 |
+-# install(TARGETS caliper-callpath DESTINATION lib) |
282 |
++# install(TARGETS caliper-callpath DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
283 |
+ |
284 |
+ add_library(caliper-callpath OBJECT ${CALIPER_CALLPATH_SOURCES}) |
285 |
+ |
286 |
+diff --git a/src/services/mpiwrap/CMakeLists.txt b/src/services/mpiwrap/CMakeLists.txt |
287 |
+index 53a8377..c381347 100644 |
288 |
+--- a/src/services/mpiwrap/CMakeLists.txt |
289 |
++++ b/src/services/mpiwrap/CMakeLists.txt |
290 |
+@@ -27,6 +27,6 @@ target_link_libraries(caliper-mpiwrap ${MPI_C_LIBRARIES}) |
291 |
+ |
292 |
+ install(TARGETS caliper-mpiwrap |
293 |
+ EXPORT caliper |
294 |
+- ARCHIVE DESTINATION lib |
295 |
+- LIBRARY DESTINATION lib) |
296 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
297 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
298 |
+ add_caliper_service("mpi CALIPER_HAVE_MPI") |
299 |
+diff --git a/src/services/ompt/CMakeLists.txt b/src/services/ompt/CMakeLists.txt |
300 |
+index f0e4085..8563eb2 100644 |
301 |
+--- a/src/services/ompt/CMakeLists.txt |
302 |
++++ b/src/services/ompt/CMakeLists.txt |
303 |
+@@ -8,7 +8,7 @@ set(CALIPER_OMPT_SOURCES |
304 |
+ # target_link_libraries(caliper-ompt caliper-common) |
305 |
+ # target_link_libraries(caliper-ompt caliper) |
306 |
+ |
307 |
+-# install(TARGETS caliper-ompt DESTINATION lib) |
308 |
++# install(TARGETS caliper-ompt DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
309 |
+ |
310 |
+ add_library(caliper-ompt OBJECT ${CALIPER_OMPT_SOURCES}) |
311 |
+ |
312 |
+diff --git a/src/services/papi/CMakeLists.txt b/src/services/papi/CMakeLists.txt |
313 |
+index 70dab41..fa971cc 100644 |
314 |
+--- a/src/services/papi/CMakeLists.txt |
315 |
++++ b/src/services/papi/CMakeLists.txt |
316 |
+@@ -9,7 +9,7 @@ set(CALIPER_PAPI_SOURCES |
317 |
+ # target_link_libraries(caliper-papi caliper) |
318 |
+ # target_link_libraries(caliper-papi ${PAPI_LIBRARIES}) |
319 |
+ |
320 |
+-# install(TARGETS caliper-papi DESTINATION lib) |
321 |
++# install(TARGETS caliper-papi DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
322 |
+ |
323 |
+ add_library(caliper-papi OBJECT ${CALIPER_PAPI_SOURCES}) |
324 |
+ |
325 |
+diff --git a/src/services/recorder/CMakeLists.txt b/src/services/recorder/CMakeLists.txt |
326 |
+index c0543d4..c5c6ea8 100644 |
327 |
+--- a/src/services/recorder/CMakeLists.txt |
328 |
++++ b/src/services/recorder/CMakeLists.txt |
329 |
+@@ -7,7 +7,7 @@ set(CALIPER_RECORDER_SOURCES |
330 |
+ # target_link_libraries(caliper-recorder caliper-common) |
331 |
+ # target_link_libraries(caliper-recorder caliper) |
332 |
+ |
333 |
+-# install(TARGETS caliper-recorder DESTINATION lib) |
334 |
++# install(TARGETS caliper-recorder DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
335 |
+ |
336 |
+ add_service_sources(${CALIPER_RECORDER_SOURCES}) |
337 |
+ add_caliper_service("recorder") |
338 |
+diff --git a/src/tools/cali-graph/CMakeLists.txt b/src/tools/cali-graph/CMakeLists.txt |
339 |
+index 2b90f51..e3aa7c1 100644 |
340 |
+--- a/src/tools/cali-graph/CMakeLists.txt |
341 |
++++ b/src/tools/cali-graph/CMakeLists.txt |
342 |
+@@ -13,4 +13,4 @@ target_link_libraries(cali-graph caliper-common) |
343 |
+ target_link_libraries(cali-graph caliper-tools-util) |
344 |
+ target_link_libraries(cali-graph caliper) |
345 |
+ |
346 |
+-install(TARGETS cali-graph DESTINATION bin) |
347 |
++install(TARGETS cali-graph DESTINATION ${CMAKE_INSTALL_BINDIR}) |
348 |
+diff --git a/src/tools/cali-query/CMakeLists.txt b/src/tools/cali-query/CMakeLists.txt |
349 |
+index e013e96..72202be 100644 |
350 |
+--- a/src/tools/cali-query/CMakeLists.txt |
351 |
++++ b/src/tools/cali-query/CMakeLists.txt |
352 |
+@@ -13,4 +13,4 @@ target_link_libraries(cali-query caliper-common) |
353 |
+ target_link_libraries(cali-query caliper-tools-util) |
354 |
+ target_link_libraries(cali-query caliper) |
355 |
+ |
356 |
+-install(TARGETS cali-query DESTINATION bin) |
357 |
++install(TARGETS cali-query DESTINATION ${CMAKE_INSTALL_BINDIR}) |
358 |
+diff --git a/src/tools/cali-stat/CMakeLists.txt b/src/tools/cali-stat/CMakeLists.txt |
359 |
+index 35395d9..d337abb 100644 |
360 |
+--- a/src/tools/cali-stat/CMakeLists.txt |
361 |
++++ b/src/tools/cali-stat/CMakeLists.txt |
362 |
+@@ -13,4 +13,4 @@ target_link_libraries(cali-stat caliper-common) |
363 |
+ target_link_libraries(cali-stat caliper-tools-util) |
364 |
+ target_link_libraries(cali-stat caliper) |
365 |
+ |
366 |
+-install(TARGETS cali-stat DESTINATION bin) |
367 |
++install(TARGETS cali-stat DESTINATION ${CMAKE_INSTALL_BINDIR}) |
368 |
+diff --git a/src/tools/util/CMakeLists.txt b/src/tools/util/CMakeLists.txt |
369 |
+index be4e393..652194c 100644 |
370 |
+--- a/src/tools/util/CMakeLists.txt |
371 |
++++ b/src/tools/util/CMakeLists.txt |
372 |
+@@ -5,9 +5,9 @@ set(CALIPER_TOOLS_UTIL_HEADERS |
373 |
+ |
374 |
+ add_library(caliper-tools-util ${CALIPER_TOOLS_UTIL_SOURCES}) |
375 |
+ |
376 |
+-install(FILES ${CALIPER_TOOLS_UTIL_HEADERS} DESTINATION include/caliper) |
377 |
++install(FILES ${CALIPER_TOOLS_UTIL_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/caliper) |
378 |
+ |
379 |
+ install(TARGETS caliper-tools-util |
380 |
+ EXPORT caliper |
381 |
+- ARCHIVE DESTINATION lib |
382 |
+- LIBRARY DESTINATION lib) |
383 |
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
384 |
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) |
385 |
+-- |
386 |
+2.7.3 |
387 |
+ |
388 |
|
389 |
diff --git a/dev-libs/caliper/files/caliper-1.5.0-python2.patch b/dev-libs/caliper/files/caliper-1.5.0-python2.patch |
390 |
new file mode 100644 |
391 |
index 00000000..0fabbe2 |
392 |
--- /dev/null |
393 |
+++ b/dev-libs/caliper/files/caliper-1.5.0-python2.patch |
394 |
@@ -0,0 +1,22 @@ |
395 |
+From 916e2cc2d326575894c651947035afe06a6d936f Mon Sep 17 00:00:00 2001 |
396 |
+From: Christoph Junghans <junghans@××××.gov> |
397 |
+Date: Wed, 30 Nov 2016 10:53:58 -0700 |
398 |
+Subject: [PATCH] wrap.py: is not python3 compliant |
399 |
+ |
400 |
+--- |
401 |
+ src/services/mpiwrap/wrap.py | 2 +- |
402 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
403 |
+ |
404 |
+diff --git a/src/services/mpiwrap/wrap.py b/src/services/mpiwrap/wrap.py |
405 |
+index 7a3122f..86bb2f3 100755 |
406 |
+--- a/src/services/mpiwrap/wrap.py |
407 |
++++ b/src/services/mpiwrap/wrap.py |
408 |
+@@ -1,4 +1,4 @@ |
409 |
+-#!/usr/bin/env python |
410 |
++#!/usr/bin/env python2 |
411 |
+ ################################################################################################# |
412 |
+ # Copyright (c) 2010, Lawrence Livermore National Security, LLC. |
413 |
+ # Produced at the Lawrence Livermore National Laboratory |
414 |
+-- |
415 |
+2.7.3 |
416 |
+ |
417 |
|
418 |
diff --git a/dev-libs/caliper/metadata.xml b/dev-libs/caliper/metadata.xml |
419 |
new file mode 100644 |
420 |
index 00000000..c7fb023 |
421 |
--- /dev/null |
422 |
+++ b/dev-libs/caliper/metadata.xml |
423 |
@@ -0,0 +1,11 @@ |
424 |
+<?xml version="1.0" encoding="UTF-8"?> |
425 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
426 |
+<pkgmetadata> |
427 |
+ <maintainer type="person"> |
428 |
+ <email>junghans@g.o</email> |
429 |
+ <name>Christoph Junghans</name> |
430 |
+ </maintainer> |
431 |
+ <upstream> |
432 |
+ <remote-id type="github">LLNL/Caliper</remote-id> |
433 |
+ </upstream> |
434 |
+</pkgmetadata> |