* [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
@ 2013-12-07 19:10 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2013-12-07 19:10 UTC (permalink / raw
To: gentoo-commits
jlec 13/12/07 19:10:23
Modified: flann-1.7.1.ebuild ChangeLog
Added: flann-9999.ebuild flann-1.8.4-r1.ebuild
Removed: flann-1.8.4.ebuild
Log:
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
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path
1.5 sci-libs/flann/flann-1.7.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild?r1=1.4&r2=1.5
Index: flann-1.7.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flann-1.7.1.ebuild 3 Aug 2012 17:33:35 -0000 1.4
+++ flann-1.7.1.ebuild 7 Dec 2013 19:10:22 -0000 1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v 1.4 2012/08/03 17:33:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-1.7.1.ebuild,v 1.5 2013/12/07 19:10:22 jlec Exp $
EAPI=3
@@ -9,7 +9,7 @@
inherit cmake-utils eutils python
DESCRIPTION="Library for performing fast approximate nearest neighbor searches in high dimensional spaces"
-HOMEPAGE="http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN/"
+HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
SRC_URI="http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip
test? ( http://dev.gentoo.org/~dilfridge/distfiles/${PN}-1.6.10-testdata.tar.xz )"
1.21 sci-libs/flann/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/ChangeLog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/ChangeLog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/ChangeLog?r1=1.20&r2=1.21
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog 1 Dec 2013 19:05:59 -0000 1.20
+++ ChangeLog 7 Dec 2013 19:10:22 -0000 1.21
@@ -1,6 +1,18 @@
# ChangeLog for sci-libs/flann
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.20 2013/12/01 19:05:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/ChangeLog,v 1.21 2013/12/07 19:10:22 jlec Exp $
+
+*flann-9999 (07 Dec 2013)
+*flann-1.8.4-r1 (07 Dec 2013)
+
+ 07 Dec 2013; Justin Lecher <jlec@gentoo.org> flann-1.7.1.ebuild,
+ -flann-1.8.4.ebuild, +flann-1.8.4-r1.ebuild, +flann-9999.ebuild,
+ +files/flann-1.8.4-CUDA_NVCC_FLAGS.patch, +files/flann-1.8.4-cuda5.5.patch,
+ +files/flann-1.8.4-docdir.patch, +files/flann-1.8.4-examples.patch,
+ +files/flann-1.8.4-multilib.patch, +files/flann-1.8.4-options.patch:
+ 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
01 Dec 2013; Justin Lecher <jlec@gentoo.org> flann-1.8.4.ebuild:
only depend on hdf5 with USE=mpi and tests, #492584; thanks nikoli for the
1.1 sci-libs/flann/flann-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-9999.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-9999.ebuild?rev=1.1&content-type=text/plain
Index: flann-9999.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-libs/flann/flann-9999.ebuild,v 1.1 2013/12/07 19:10:22 jlec Exp $
EAPI=5
inherit cmake-utils cuda eutils git-r3 multilib toolchain-funcs
DESCRIPTION="Library for performing fast approximate nearest neighbor searches in high dimensional spaces"
HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
SRC_URI="test? ( http://dev.gentoo.org/~bicatali/distfiles/${PN}-1.8.4-testdata.tar.xz )"
EGIT_REPO_URI="https://github.com/mariusmuja/flann.git"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="cuda doc examples mpi openmp octave static-libs test"
RDEPEND="
cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
mpi? (
sci-libs/hdf5[mpi]
dev-libs/boost[mpi]
)
!mpi? ( !sci-libs/hdf5[mpi] )
octave? ( >=sci-mathematics/octave-3.6.4-r1 )"
DEPEND="${RDEPEND}
app-arch/unzip
doc? ( dev-tex/latex2html )
test? (
dev-cpp/gtest
cuda? ( sci-libs/hdf5 )
)
"
PATCHES=(
"${FILESDIR}"/${PN}-1.8.4-options.patch
"${FILESDIR}"/${PN}-1.8.4-CUDA_NVCC_FLAGS.patch
"${FILESDIR}"/${PN}-1.8.4-cuda5.5.patch
"${FILESDIR}"/${PN}-1.8.4-multilib.patch
"${FILESDIR}"/${PN}-1.8.4-docdir.patch
)
pkg_setup() {
if use openmp; then
if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
ewarn "OpenMP is not available in your current selected gcc"
die "need openmp capable gcc"
fi
fi
}
src_unpack() {
default
git-r3_src_unpack
}
src_prepare() {
# bug #302621
use mpi && export CXX=mpicxx
# produce pure octave files
# octave gentoo installation for .m files respected
sed -i \
-e 's/--mex//' \
-e 's/\.mex/\.oct/' \
-e '/FILES/s/${MEX_FILE}//' \
-e 's:share/flann/octave:share/octave/site/m:' \
-e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \
src/matlab/CMakeLists.txt || die
use cuda && cuda_src_prepare
cmake-utils_src_prepare
}
src_configure() {
# python bindings are split
local mycmakeargs=(
-DBUILD_C_BINDINGS=ON
-DBUILD_PYTHON_BINDINGS=OFF
-DPYTHON_EXECUTABLE=
-DDOCDIR=share/doc/${PF}
$(cmake-utils_use_build cuda CUDA_LIB)
$(cmake-utils_use_build examples)
$(cmake-utils_use_build doc)
$(cmake-utils_use_build test TESTS)
$(cmake-utils_use_build octave MATLAB_BINDINGS)
$(cmake-utils_use_use mpi)
$(cmake-utils_use_use openmp)
)
use cuda && \
mycmakeargs+=(
-DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch"
)
cmake-utils_src_configure
}
src_test() {
ln -s "${WORKDIR}"/testdata/* test/ || die
# -j1 to avoid obversubscribing jobs
LD_LIBRARY_PATH="${BUILD_DIR}/lib" \
cmake-utils_src_compile -j1 test
}
src_install() {
cmake-utils_src_install
dodoc README.md
if ! use static-libs; then
find "${ED}" -name 'lib*.a' -exec rm -rf '{}' '+' || die
fi
}
1.1 sci-libs/flann/flann-1.8.4-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/flann/flann-1.8.4-r1.ebuild?rev=1.1&view=markup
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
Index: flann-1.8.4-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $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 $
EAPI=5
inherit cmake-utils cuda eutils multilib toolchain-funcs
DESCRIPTION="Library for performing fast approximate nearest neighbor searches in high dimensional spaces"
HOMEPAGE="http://www.cs.ubc.ca/research/flann/"
SRC_URI="
http://people.cs.ubc.ca/~mariusm/uploads/FLANN/${P}-src.zip
test? ( http://dev.gentoo.org/~bicatali/distfiles/${P}-testdata.tar.xz )"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="cuda doc examples mpi openmp octave static-libs test"
RDEPEND="
cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
mpi? (
sci-libs/hdf5[mpi]
dev-libs/boost[mpi]
)
!mpi? ( !sci-libs/hdf5[mpi] )
octave? ( >=sci-mathematics/octave-3.6.4-r1 )"
DEPEND="${RDEPEND}
app-arch/unzip
doc? ( dev-tex/latex2html )
test? (
dev-cpp/gtest
cuda? ( sci-libs/hdf5 )
)
"
PATCHES=(
"${FILESDIR}"/${P}-examples.patch
"${FILESDIR}"/${P}-options.patch
"${FILESDIR}"/${P}-CUDA_NVCC_FLAGS.patch
"${FILESDIR}"/${P}-cuda5.5.patch
"${FILESDIR}"/${P}-multilib.patch
"${FILESDIR}"/${P}-docdir.patch
)
S="${WORKDIR}"/${P}-src
pkg_setup() {
if use openmp; then
if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
ewarn "OpenMP is not available in your current selected gcc"
die "need openmp capable gcc"
fi
fi
}
src_prepare() {
# bug #302621
use mpi && export CXX=mpicxx
# produce pure octave files
# octave gentoo installation for .m files respected
sed -i \
-e 's/--mex//' \
-e 's/\.mex/\.oct/' \
-e '/FILES/s/${MEX_FILE}//' \
-e 's:share/flann/octave:share/octave/site/m:' \
-e "/CUSTOM_TARGET/a\INSTALL(FILES \${MEX_FILE} DESTINATION libexec/octave/site/oct/${CHOST})" \
src/matlab/CMakeLists.txt || die
use cuda && cuda_src_prepare
cmake-utils_src_prepare
}
src_configure() {
# python bindings are split
local mycmakeargs=(
-DBUILD_C_BINDINGS=ON
-DBUILD_PYTHON_BINDINGS=OFF
-DPYTHON_EXECUTABLE=
-DDOCDIR=share/doc/${PF}
$(cmake-utils_use_build cuda CUDA_LIB)
$(cmake-utils_use_build examples)
$(cmake-utils_use_build doc)
$(cmake-utils_use_build test TESTS)
$(cmake-utils_use_build octave MATLAB_BINDINGS)
$(cmake-utils_use_use mpi)
$(cmake-utils_use_use openmp)
)
use cuda && \
mycmakeargs+=(
-DCUDA_NVCC_FLAGS="${NVCCFLAGS},-arsch"
)
cmake-utils_src_configure
}
src_test() {
ln -s "${WORKDIR}"/testdata/* test/ || die
# -j1 to avoid obversubscribing jobs
LD_LIBRARY_PATH="${BUILD_DIR}/lib" \
cmake-utils_src_compile -j1 test
}
src_install() {
cmake-utils_src_install
dodoc README.md
if ! use static-libs; then
find "${ED}" -name 'lib*.a' -exec rm -rf '{}' '+' || die
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-12-07 19:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-07 19:10 [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 Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox