Gentoo Archives: gentoo-commits

From: Christoph Junghans <ottxor@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/legion/files/, sys-cluster/legion/
Date: Fri, 02 Sep 2016 22:28:14
Message-Id: 1472855275.50d751cf3d0e5250817438bb0a5cdf89f806cb92.ottxor@gentoo
1 commit: 50d751cf3d0e5250817438bb0a5cdf89f806cb92
2 Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 2 22:27:43 2016 +0000
4 Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 2 22:27:55 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d751cf
7
8 sys-cluster/legion: initial commit
9
10 Package-Manager: portage-2.2.28
11
12 sys-cluster/legion/Manifest | 1 +
13 .../legion/files/legion-16.08.0-hwloc.patch | 22 ++++
14 .../legion/files/legion-16.08.0-multilib.patch | 131 +++++++++++++++++++++
15 sys-cluster/legion/legion-16.08.0.ebuild | 36 ++++++
16 sys-cluster/legion/metadata.xml | 16 +++
17 5 files changed, 206 insertions(+)
18
19 diff --git a/sys-cluster/legion/Manifest b/sys-cluster/legion/Manifest
20 new file mode 100644
21 index 00000000..f02219e
22 --- /dev/null
23 +++ b/sys-cluster/legion/Manifest
24 @@ -0,0 +1 @@
25 +DIST legion-16.08.0.tar.gz 2501054 SHA256 c2a344e54124172b49d97e0e0033021e9ed3d9ddb4158b0620430c5597f6ccba SHA512 8847fa8c0c7683812dd6ffb038a4d6d3427fdfde62ec917ab32e9a15cd7320321cab2b106479589aa2451cabd98cd0b1dc88b4ff668f991bb4c95f383de785a5 WHIRLPOOL 355f54164fca71c49891869644c841814600c09253bc807297bc79391f13f05fbe93029f29918167cd79a745928b0d991bc671ccd841320a32ce67941f34705c
26
27 diff --git a/sys-cluster/legion/files/legion-16.08.0-hwloc.patch b/sys-cluster/legion/files/legion-16.08.0-hwloc.patch
28 new file mode 100644
29 index 00000000..f9e270c
30 --- /dev/null
31 +++ b/sys-cluster/legion/files/legion-16.08.0-hwloc.patch
32 @@ -0,0 +1,22 @@
33 +From 8c636a8547b1695105501b8b7c8c713094ef7921 Mon Sep 17 00:00:00 2001
34 +From: Christoph Junghans <christoph.junghans@×××××.com>
35 +Date: Fri, 2 Sep 2016 15:26:51 -0600
36 +Subject: [PATCH] FindHWLOC.cmake: fix syntax error
37 +
38 +---
39 + cmake/FindHWLOC.cmake | 2 +-
40 + 1 file changed, 1 insertion(+), 1 deletion(-)
41 +
42 +diff --git a/cmake/FindHWLOC.cmake b/cmake/FindHWLOC.cmake
43 +index 1019b59..1e9e97d 100644
44 +--- a/cmake/FindHWLOC.cmake
45 ++++ b/cmake/FindHWLOC.cmake
46 +@@ -28,7 +28,7 @@ if(NOT HWLOC_FOUND AND NOT TARGET HWLOC)
47 + # Save the existing prefix options
48 + set(_CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH})
49 + set(_CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH})
50 +- set(CMAKE_PREFIX_PATH ${HWLOC_ROOT_DIR}
51 ++ set(CMAKE_PREFIX_PATH ${HWLOC_ROOT_DIR})
52 + unset(CMAKE_LIBRARY_PATH)
53 + set(_HWLOC_FIND_OPTS
54 + NO_CMAKE_ENVIRONMENT_PATH
55
56 diff --git a/sys-cluster/legion/files/legion-16.08.0-multilib.patch b/sys-cluster/legion/files/legion-16.08.0-multilib.patch
57 new file mode 100644
58 index 00000000..7ddd9a8
59 --- /dev/null
60 +++ b/sys-cluster/legion/files/legion-16.08.0-multilib.patch
61 @@ -0,0 +1,131 @@
62 +From f9b71c86098c16436c3a51d8706f52f720ef008d Mon Sep 17 00:00:00 2001
63 +From: Christoph Junghans <junghans@××××.gov>
64 +Date: Fri, 2 Sep 2016 15:54:49 -0600
65 +Subject: [PATCH] cmake: support multilib
66 +
67 +---
68 + CMakeLists.txt | 26 ++++++++++++++++----------
69 + runtime/CMakeLists.txt | 8 ++++----
70 + 2 files changed, 20 insertions(+), 14 deletions(-)
71 +
72 +diff --git a/CMakeLists.txt b/CMakeLists.txt
73 +index 726e8e4..181a2bd 100644
74 +--- a/CMakeLists.txt
75 ++++ b/CMakeLists.txt
76 +@@ -20,12 +20,18 @@ project(Legion)
77 + #------------------------------------------------------------------------------#
78 + # Some boilerplate to setup nice output directories
79 + #------------------------------------------------------------------------------#
80 ++
81 ++#for multilib distros
82 ++if (NOT DEFINED LIB)
83 ++ set(LIB "lib")
84 ++endif(NOT DEFINED LIB)
85 ++
86 + list(INSERT CMAKE_MODULE_PATH 0 "${Legion_SOURCE_DIR}/cmake")
87 + if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
88 +- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/lib)
89 ++ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/${LIB})
90 + endif()
91 + if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
92 +- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/lib)
93 ++ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/${LIB})
94 + endif()
95 + if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
96 + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${Legion_BINARY_DIR}/bin)
97 +@@ -50,7 +56,7 @@ option(Legion_USE_HWLOC "Use hwloc for topology awareness" OFF)
98 + if(Legion_USE_HWLOC)
99 + find_package(HWLOC REQUIRED)
100 + install(FILES ${Legion_SOURCE_DIR}/cmake/FindHWLOC.cmake
101 +- DESTINATION lib/cmake/Legion
102 ++ DESTINATION ${LIB}/cmake/Legion
103 + )
104 + endif()
105 +
106 +@@ -69,7 +75,7 @@ if(Legion_USE_GASNet)
107 + mark_as_advanced(GASNet_CONDUIT)
108 + find_package(GASNet REQUIRED)
109 + install(FILES ${Legion_SOURCE_DIR}/cmake/FindGASNet.cmake
110 +- DESTINATION lib/cmake/Legion
111 ++ DESTINATION ${LIB}/cmake/Legion
112 + )
113 + endif()
114 +
115 +@@ -81,7 +87,7 @@ if(Legion_USE_LLVM)
116 + set(Legion_LLVM_COMPONENTS irreader jit mcjit x86)
117 + find_package(LLVM REQUIRED COMPONENTS ${Legion_LLVM_COMPONENTS})
118 + install(FILES ${Legion_SOURCE_DIR}/cmake/FindLLVM.cmake
119 +- DESTINATION lib/cmake/Legion
120 ++ DESTINATION ${LIB}/cmake/Legion
121 + )
122 + endif()
123 +
124 +@@ -97,10 +103,10 @@ if(Legion_USE_CUDA)
125 + endif()
126 + find_package(CUDA REQUIRED)
127 + install(FILES ${Legion_SOURCE_DIR}/cmake/FindCUDA.cmake
128 +- DESTINATION lib/cmake/Legion
129 ++ DESTINATION ${LIB}/cmake/Legion
130 + )
131 + install(FILES ${Legion_SOURCE_DIR}/cmake/newcmake/FindCUDA.cmake
132 +- DESTINATION lib/cmake/Legion/newcmake
133 ++ DESTINATION ${LIB}/cmake/Legion/newcmake
134 + )
135 + endif()
136 +
137 +@@ -128,7 +134,7 @@ export(EXPORT LegionTargets
138 + install(EXPORT LegionTargets
139 + NAMESPACE Legion::
140 + FILE LegionTargets.cmake
141 +- DESTINATION lib/cmake/Legion
142 ++ DESTINATION ${LIB}/cmake/Legion
143 + )
144 +
145 + configure_file(
146 +@@ -137,7 +143,7 @@ configure_file(
147 + @ONLY
148 + )
149 + install(FILES ${Legion_BINARY_DIR}/LegionConfigCommon.cmake
150 +- DESTINATION lib/cmake/Legion
151 ++ DESTINATION ${LIB}/cmake/Legion
152 + )
153 +
154 + configure_file(
155 +@@ -147,7 +153,7 @@ configure_file(
156 + )
157 +
158 + install(FILES cmake/LegionConfig-install.cmake
159 +- DESTINATION lib/cmake/Legion
160 ++ DESTINATION ${LIB}/cmake/Legion
161 + RENAME LegionConfig.cmake
162 + )
163 +
164 +diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
165 +index e21e141..91f6a03 100644
166 +--- a/runtime/CMakeLists.txt
167 ++++ b/runtime/CMakeLists.txt
168 +@@ -176,8 +176,8 @@ target_include_directories(LowLevelRuntime
169 + )
170 +
171 + install(TARGETS LowLevelRuntime EXPORT LegionTargets
172 +- LIBRARY DESTINATION lib
173 +- ARCHIVE DESTINATION lib
174 ++ LIBRARY DESTINATION ${LIB}
175 ++ ARCHIVE DESTINATION ${LIB}
176 + RUNTIME DESTINATION bin
177 + )
178 +
179 +@@ -244,8 +244,8 @@ target_include_directories(HighLevelRuntime
180 + )
181 +
182 + install(TARGETS HighLevelRuntime EXPORT LegionTargets
183 +- LIBRARY DESTINATION lib
184 +- ARCHIVE DESTINATION lib
185 ++ LIBRARY DESTINATION ${LIB}
186 ++ ARCHIVE DESTINATION ${LIB}
187 + RUNTIME DESTINATION bin
188 + )
189 +
190 +--
191 +2.7.3
192 +
193
194 diff --git a/sys-cluster/legion/legion-16.08.0.ebuild b/sys-cluster/legion/legion-16.08.0.ebuild
195 new file mode 100644
196 index 00000000..534945d
197 --- /dev/null
198 +++ b/sys-cluster/legion/legion-16.08.0.ebuild
199 @@ -0,0 +1,36 @@
200 +# Copyright 1999-2016 Gentoo Foundation
201 +# Distributed under the terms of the GNU General Public License v2
202 +# $Id$
203 +
204 +EAPI=6
205 +
206 +inherit cmake-utils
207 +
208 +DESCRIPTION="A data-centric parallel programming system"
209 +HOMEPAGE="http://legion.stanford.edu/"
210 +SRC_URI="https://github.com/StanfordLegion/${PN}/archive/${P}.tar.gz"
211 +
212 +LICENSE="BSD"
213 +SLOT="0"
214 +KEYWORDS="~amd64"
215 +IUSE="gasnet +hwloc"
216 +
217 +DEPEND="
218 + gasnet? ( sys-cluster/gasnet )
219 + hwloc? ( sys-apps/hwloc )
220 + "
221 +
222 +S="${WORKDIR}/${PN}-${P}"
223 +
224 +#https://github.com/StanfordLegion/legion/pull/166
225 +#https://github.com/StanfordLegion/legion/pull/167
226 +PATCHES=( "${FILESDIR}/${P}-hwloc.patch" "${FILESDIR}/${P}-multilib.patch" )
227 +
228 +src_configure() {
229 + mycmakeargs=(
230 + -DLegion_USE_HWLOC=$(usex hwloc)
231 + -DLegion_USE_GASNet=$(usex gasnet)
232 + -DLIB=$(get_libdir)
233 + )
234 + cmake-utils_src_configure
235 +}
236
237 diff --git a/sys-cluster/legion/metadata.xml b/sys-cluster/legion/metadata.xml
238 new file mode 100644
239 index 00000000..bae6863
240 --- /dev/null
241 +++ b/sys-cluster/legion/metadata.xml
242 @@ -0,0 +1,16 @@
243 +<?xml version="1.0" encoding="UTF-8"?>
244 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
245 +<pkgmetadata>
246 + <maintainer type="person">
247 + <email>ottxor@g.o</email>
248 + <name>Christoph Junghans</name>
249 + </maintainer>
250 + <maintainer type="project">
251 + <email>cluster@g.o</email>
252 + <name>Gentoo Cluster Project</name>
253 + </maintainer>
254 + <use>
255 + <flag name="hwloc">Enable HWLoc lib support</flag>
256 + <flag name="gasnet">Enable GASNet lib support</flag>
257 + </use>
258 +</pkgmetadata>