Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/flann: flann-1.7.1.ebuild ChangeLog flann-9999.ebuild flann-1.8.4-r1.ebuild flann-1.8.4.ebuild
Date: Sat, 07 Dec 2013 19:10:28
Message-Id: 20131207191023.337122004E@flycatcher.gentoo.org
1 jlec 13/12/07 19:10:23
2
3 Modified: flann-1.7.1.ebuild ChangeLog
4 Added: flann-9999.ebuild flann-1.8.4-r1.ebuild
5 Removed: flann-1.8.4.ebuild
6 Log:
7 sci-libs/flann: Fix compilation problem with cuda; depend on fixed octave version for gcc-4.8, #492488; patch cmake and send patches upstream instead of sedding, add missing deps; use cuda.eclass; fix HOMEPAGE
8
9 (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
10
11 Revision Changes Path
12 1.5 sci-libs/flann/flann-1.7.1.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild?rev=1.5&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild?rev=1.5&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild?r1=1.4&r2=1.5
17
18 Index: flann-1.7.1.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v
21 retrieving revision 1.4
22 retrieving revision 1.5
23 diff -u -r1.4 -r1.5
24 --- flann-1.7.1.ebuild 3 Aug 2012 17:33:35 -0000 1.4
25 +++ flann-1.7.1.ebuild 7 Dec 2013 19:10:22 -0000 1.5
26 @@ -1,6 +1,6 @@
27 -# Copyright 1999-2012 Gentoo Foundation
28 +# Copyright 1999-2013 Gentoo Foundation
29 # Distributed under the terms of the GNU General Public License v2
30 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v 1.4 2012/08/03 17:33:35 bicatali Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v 1.5 2013/12/07 19:10:22 jlec Exp $
32
33 EAPI=3
34
35 @@ -9,7 +9,7 @@
36 inherit cmake-utils eutils python
37
38 DESCRIPTION="Library for performing fast approximate nearest neighbor searches in high dimensional spaces"
39 -HOMEPAGE="http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN/"
40 +HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
41 SRC_URI="http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip
42 test? ( http://dev.gentoo.org/~dilfridge/distfiles/${PN}-1.6.10-testdata.tar.xz )"
43
44
45
46
47 1.21 sci-libs/flann/ChangeLog
48
49 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/ChangeLog?rev=1.21&view=markup
50 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/ChangeLog?rev=1.21&content-type=text/plain
51 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/ChangeLog?r1=1.20&r2=1.21
52
53 Index: ChangeLog
54 ===================================================================
55 RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v
56 retrieving revision 1.20
57 retrieving revision 1.21
58 diff -u -r1.20 -r1.21
59 --- ChangeLog 1 Dec 2013 19:05:59 -0000 1.20
60 +++ ChangeLog 7 Dec 2013 19:10:22 -0000 1.21
61 @@ -1,6 +1,18 @@
62 # ChangeLog for sci-libs/flann
63 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
64 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.20 2013/12/01 19:05:59 jlec Exp $
65 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.21 2013/12/07 19:10:22 jlec Exp $
66 +
67 +*flann-9999 (07 Dec 2013)
68 +*flann-1.8.4-r1 (07 Dec 2013)
69 +
70 + 07 Dec 2013; Justin Lecher <jlec@g.o> flann-1.7.1.ebuild,
71 + -flann-1.8.4.ebuild, +flann-1.8.4-r1.ebuild, +flann-9999.ebuild,
72 + +files/flann-1.8.4-CUDA_NVCC_FLAGS.patch, +files/flann-1.8.4-cuda5.5.patch,
73 + +files/flann-1.8.4-docdir.patch, +files/flann-1.8.4-examples.patch,
74 + +files/flann-1.8.4-multilib.patch, +files/flann-1.8.4-options.patch:
75 + Fix compilation problem with cuda; depend on fixed octave version for
76 + gcc-4.8, #492488; patch cmake and send patches upstream instead of sedding,
77 + add missing deps; use cuda.eclass; fix HOMEPAGE
78
79 01 Dec 2013; Justin Lecher <jlec@g.o> flann-1.8.4.ebuild:
80 only depend on hdf5 with USE=mpi and tests, #492584; thanks nikoli for the
81
82
83
84 1.1 sci-libs/flann/flann-9999.ebuild
85
86 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-9999.ebuild?rev=1.1&view=markup
87 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-9999.ebuild?rev=1.1&content-type=text/plain
88
89 Index: flann-9999.ebuild
90 ===================================================================
91 # Copyright 1999-2013 Gentoo Foundation
92 # Distributed under the terms of the GNU General Public License v2
93 # $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-9999.ebuild,v 1.1 2013/12/07 19:10:22 jlec Exp $
94
95 EAPI=5
96
97 inherit cmake-utils cuda eutils git-r3 multilib toolchain-funcs
98
99 DESCRIPTION="Library for performing fast approximate nearest neighbor searches in high dimensional spaces"
100 HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
101 SRC_URI="test? ( http://dev.gentoo.org/~bicatali/distfiles/${PN}-1.8.4-testdata.tar.xz )"
102 EGIT_REPO_URI="https://github.com/mariusmuja/flann.git"
103
104 LICENSE="BSD"
105 SLOT="0"
106 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
107 IUSE="cuda doc examples mpi openmp octave static-libs test"
108
109 RDEPEND="
110 cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
111 mpi? (
112 sci-libs/hdf5[mpi]
113 dev-libs/boost[mpi]
114 )
115 !mpi? ( !sci-libs/hdf5[mpi] )
116 octave? ( >=sci-mathematics/octave-3.6.4-r1 )"
117 DEPEND="${RDEPEND}
118 app-arch/unzip
119 doc? ( dev-tex/latex2html )
120 test? (
121 dev-cpp/gtest
122 cuda? ( sci-libs/hdf5 )
123 )
124 "
125
126 PATCHES=(
127 "${FILESDIR}"/${PN}-1.8.4-options.patch
128 "${FILESDIR}"/${PN}-1.8.4-CUDA_NVCC_FLAGS.patch
129 "${FILESDIR}"/${PN}-1.8.4-cuda5.5.patch
130 "${FILESDIR}"/${PN}-1.8.4-multilib.patch
131 "${FILESDIR}"/${PN}-1.8.4-docdir.patch
132 )
133
134 pkg_setup() {
135 if use openmp; then
136 if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
137 ewarn "OpenMP is not available in your current selected gcc"
138 die "need openmp capable gcc"
139 fi
140 fi
141 }
142
143 src_unpack() {
144 default
145 git-r3_src_unpack
146 }
147
148 src_prepare() {
149 # bug #302621
150 use mpi && export CXX=mpicxx
151
152 # produce pure octave files
153 # octave gentoo installation for .m files respected
154 sed -i \
155 -e 's/--mex//' \
156 -e 's/\.mex/\.oct/' \
157 -e '/FILES/s/${MEX_FILE}//' \
158 -e 's:share/flann/octave:share/octave/site/m:' \
159 -e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \
160 src/matlab/CMakeLists.txt || die
161 use cuda && cuda_src_prepare
162
163 cmake-utils_src_prepare
164 }
165
166 src_configure() {
167 # python bindings are split
168 local mycmakeargs=(
169 -DBUILD_C_BINDINGS=ON
170 -DBUILD_PYTHON_BINDINGS=OFF
171 -DPYTHON_EXECUTABLE=
172 -DDOCDIR=share/doc/${PF}
173 $(cmake-utils_use_build cuda CUDA_LIB)
174 $(cmake-utils_use_build examples)
175 $(cmake-utils_use_build doc)
176 $(cmake-utils_use_build test TESTS)
177 $(cmake-utils_use_build octave MATLAB_BINDINGS)
178 $(cmake-utils_use_use mpi)
179 $(cmake-utils_use_use openmp)
180 )
181 use cuda && \
182 mycmakeargs+=(
183 -DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch"
184 )
185 cmake-utils_src_configure
186 }
187
188 src_test() {
189 ln -s "${WORKDIR}"/testdata/* test/ || die
190 # -j1 to avoid obversubscribing jobs
191 LD_LIBRARY_PATH="${BUILD_DIR}/lib" \
192 cmake-utils_src_compile -j1 test
193 }
194
195 src_install() {
196 cmake-utils_src_install
197 dodoc README.md
198 if ! use static-libs; then
199 find "${ED}" -name 'lib*.a' -exec rm -rf '{}' '+' || die
200 fi
201 }
202
203
204
205 1.1 sci-libs/flann/flann-1.8.4-r1.ebuild
206
207 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.8.4-r1.ebuild?rev=1.1&view=markup
208 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.8.4-r1.ebuild?rev=1.1&content-type=text/plain
209
210 Index: flann-1.8.4-r1.ebuild
211 ===================================================================
212 # Copyright 1999-2013 Gentoo Foundation
213 # Distributed under the terms of the GNU General Public License v2
214 # $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.8.4-r1.ebuild,v 1.1 2013/12/07 19:10:22 jlec Exp $
215
216 EAPI=5
217
218 inherit cmake-utils cuda eutils multilib toolchain-funcs
219
220 DESCRIPTION="Library for performing fast approximate nearest neighbor searches in high dimensional spaces"
221 HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
222 SRC_URI="
223 http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip
224 test? ( http://dev.gentoo.org/~bicatali/distfiles/${P}-testdata.tar.xz )"
225
226 LICENSE="BSD"
227 SLOT="0"
228 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
229 IUSE="cuda doc examples mpi openmp octave static-libs test"
230
231 RDEPEND="
232 cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
233 mpi? (
234 sci-libs/hdf5[mpi]
235 dev-libs/boost[mpi]
236 )
237 !mpi? ( !sci-libs/hdf5[mpi] )
238 octave? ( >=sci-mathematics/octave-3.6.4-r1 )"
239 DEPEND="${RDEPEND}
240 app-arch/unzip
241 doc? ( dev-tex/latex2html )
242 test? (
243 dev-cpp/gtest
244 cuda? ( sci-libs/hdf5 )
245 )
246 "
247
248 PATCHES=(
249 "${FILESDIR}"/${P}-examples.patch
250 "${FILESDIR}"/${P}-options.patch
251 "${FILESDIR}"/${P}-CUDA_NVCC_FLAGS.patch
252 "${FILESDIR}"/${P}-cuda5.5.patch
253 "${FILESDIR}"/${P}-multilib.patch
254 "${FILESDIR}"/${P}-docdir.patch
255 )
256
257 S="${WORKDIR}"/${P}-src
258
259 pkg_setup() {
260 if use openmp; then
261 if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
262 ewarn "OpenMP is not available in your current selected gcc"
263 die "need openmp capable gcc"
264 fi
265 fi
266 }
267
268 src_prepare() {
269 # bug #302621
270 use mpi && export CXX=mpicxx
271 # produce pure octave files
272 # octave gentoo installation for .m files respected
273 sed -i \
274 -e 's/--mex//' \
275 -e 's/\.mex/\.oct/' \
276 -e '/FILES/s/${MEX_FILE}//' \
277 -e 's:share/flann/octave:share/octave/site/m:' \
278 -e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \
279 src/matlab/CMakeLists.txt || die
280 use cuda && cuda_src_prepare
281
282 cmake-utils_src_prepare
283 }
284
285 src_configure() {
286 # python bindings are split
287 local mycmakeargs=(
288 -DBUILD_C_BINDINGS=ON
289 -DBUILD_PYTHON_BINDINGS=OFF
290 -DPYTHON_EXECUTABLE=
291 -DDOCDIR=share/doc/${PF}
292 $(cmake-utils_use_build cuda CUDA_LIB)
293 $(cmake-utils_use_build examples)
294 $(cmake-utils_use_build doc)
295 $(cmake-utils_use_build test TESTS)
296 $(cmake-utils_use_build octave MATLAB_BINDINGS)
297 $(cmake-utils_use_use mpi)
298 $(cmake-utils_use_use openmp)
299 )
300 use cuda && \
301 mycmakeargs+=(
302 -DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch"
303 )
304 cmake-utils_src_configure
305 }
306
307 src_test() {
308 ln -s "${WORKDIR}"/testdata/* test/ || die
309 # -j1 to avoid obversubscribing jobs
310 LD_LIBRARY_PATH="${BUILD_DIR}/lib" \
311 cmake-utils_src_compile -j1 test
312 }
313
314 src_install() {
315 cmake-utils_src_install
316 dodoc README.md
317 if ! use static-libs; then
318 find "${ED}" -name 'lib*.a' -exec rm -rf '{}' '+' || die
319 fi
320 }
Report Message
Find on MARC Find on Google Groups