* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/, sci-libs/armadillo/files/
@ 2013-05-25 4:40 Sebastien Fabbro
0 siblings, 0 replies; 6+ messages in thread
From: Sebastien Fabbro @ 2013-05-25 4:40 UTC (permalink / raw
To: gentoo-commits
commit: 2b903d04de8bddb33c2c4956f03f9721d65d70de
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 04:22:22 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sat May 25 04:22:22 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=2b903d04
sci-libs/armadillo: Version bump
Package-Manager: portage-2.2.01.21938-prefix
RepoMan-Options: --force
---
sci-libs/armadillo/ChangeLog | 9 +++++++++
...llo-3.810.2.ebuild => armadillo-3.820.1.ebuild} | 0
.../armadillo/files/armadillo-3.810.2-hdf5.patch | 19 -------------------
...ch => armadillo-3.820.1-example-makefile.patch} | 0
.../armadillo/files/armadillo-3.820.1-hdf5.patch | 19 +++++++++++++++++++
5 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index ac1aaf0..505c50b 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,15 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*armadillo-3.820.1 (25 May 2013)
+
+ 25 May 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.820.1.ebuild,
+ +files/armadillo-3.820.1-example-makefile.patch,
+ +files/armadillo-3.820.1-hdf5.patch, -armadillo-3.810.2.ebuild,
+ -files/armadillo-3.810.2-example-makefile.patch,
+ -files/armadillo-3.810.2-hdf5.patch:
+ sci-libs/armadillo: Version bump
+
*armadillo-3.810.2 (29 Apr 2013)
29 Apr 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.810.2.ebuild,
diff --git a/sci-libs/armadillo/armadillo-3.810.2.ebuild b/sci-libs/armadillo/armadillo-3.820.1.ebuild
similarity index 100%
rename from sci-libs/armadillo/armadillo-3.810.2.ebuild
rename to sci-libs/armadillo/armadillo-3.820.1.ebuild
diff --git a/sci-libs/armadillo/files/armadillo-3.810.2-hdf5.patch b/sci-libs/armadillo/files/armadillo-3.810.2-hdf5.patch
deleted file mode 100644
index 1d2e2ff..0000000
--- a/sci-libs/armadillo/files/armadillo-3.810.2-hdf5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- CMakeLists.txt.orig 2013-02-28 14:51:42.032554805 -0800
-+++ CMakeLists.txt 2013-02-28 14:53:05.730978799 -0800
-@@ -191,11 +191,11 @@
- # find_package(HDF5)
- # message(STATUS "HDF5_FOUND = ${HDF5_FOUND}")
- #
--# if(HDF5_FOUND)
--# set(ARMA_USE_HDF5 true)
--# set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
--# set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
--# endif()
-+if(HDF5_FOUND)
-+ set(ARMA_USE_HDF5 true)
-+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
-+ set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
-+endif()
-
- message(STATUS "*** ")
- message(STATUS "*** The Armadillo run-time library component will be an alias for the following libraries:")
diff --git a/sci-libs/armadillo/files/armadillo-3.810.2-example-makefile.patch b/sci-libs/armadillo/files/armadillo-3.820.1-example-makefile.patch
similarity index 100%
rename from sci-libs/armadillo/files/armadillo-3.810.2-example-makefile.patch
rename to sci-libs/armadillo/files/armadillo-3.820.1-example-makefile.patch
diff --git a/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch b/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch
new file mode 100644
index 0000000..f294e7b
--- /dev/null
+++ b/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch
@@ -0,0 +1,19 @@
+--- CMakeLists.txt.orig 2013-05-24 21:14:49.626395820 -0700
++++ CMakeLists.txt 2013-05-24 21:15:10.724511364 -0700
+@@ -222,11 +222,11 @@
+ # find_package(HDF5)
+ # message(STATUS "HDF5_FOUND = ${HDF5_FOUND}")
+ #
+-# if(HDF5_FOUND)
+-# set(ARMA_USE_HDF5 true)
+-# set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
+-# set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
+-# endif()
++if(HDF5_FOUND)
++ set(ARMA_USE_HDF5 true)
++ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
++ set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
++endif()
+ # endif()
+
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/, sci-libs/armadillo/files/
@ 2014-06-09 16:36 Sebastien Fabbro
0 siblings, 0 replies; 6+ messages in thread
From: Sebastien Fabbro @ 2014-06-09 16:36 UTC (permalink / raw
To: gentoo-commits
commit: 0cf66cd0e42739374d9e55e28a3f2cfd1abc6553
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 2 17:02:26 2014 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Jun 2 17:02:26 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0cf66cd0
Version bump
Package-Manager: portage-HEAD
---
sci-libs/armadillo/ChangeLog | 7 ++
sci-libs/armadillo/armadillo-3.930.0.ebuild | 92 -----------------
sci-libs/armadillo/armadillo-4.100.2.ebuild | 114 ---------------------
...llo-4.300.0.ebuild => armadillo-4.300.8.ebuild} | 0
.../armadillo/files/armadillo-3.820.1-hdf5.patch | 19 ----
5 files changed, 7 insertions(+), 225 deletions(-)
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index a75b8d9..e7b3f37 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*armadillo-4.300.8 (02 Jun 2014)
+
+ 02 Jun 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.300.8.ebuild,
+ -armadillo-3.930.0.ebuild, -armadillo-4.100.2.ebuild,
+ -armadillo-4.300.0.ebuild, -files/armadillo-3.820.1-hdf5.patch:
+ Version bump
+
*armadillo-4.300.0 (06 May 2014)
06 May 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.300.0.ebuild:
diff --git a/sci-libs/armadillo/armadillo-3.930.0.ebuild b/sci-libs/armadillo/armadillo-3.930.0.ebuild
deleted file mode 100644
index 59be372..0000000
--- a/sci-libs/armadillo/armadillo-3.930.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="atlas blas debug doc examples hdf5 int64 lapack tbb"
-
-RDEPEND="
- dev-libs/boost
- atlas? ( sci-libs/atlas[lapack] )
- blas? ( virtual/blas )
- lapack? ( virtual/lapack )"
-DEPEND="${DEPEND}
- atlas? ( virtual/pkgconfig )
- blas? ( virtual/pkgconfig )
- lapack? ( virtual/pkgconfig )"
-PDEPEND="${RDEPEND}
- hdf5? ( sci-libs/hdf5 )
- tbb? ( dev-cpp/tbb )"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.820.1-{hdf5,example-makefile}.patch
- # avoid the automagic cmake macros
- sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
- $(cmake-utils_use debug ARMA_EXTRA_DEBUG)
- $(cmake-utils_use hdf5 ARMA_USE_HDF5)
- $(cmake-utils_use int64 ARMA_64BIT_WORD)
- $(cmake-utils_use tbb ARMA_TBB_ALLOC)
- )
- if use blas; then
- mycmakeargs+=(
- -DBLAS_FOUND=ON
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
- )
- fi
- if use lapack; then
- mycmakeargs+=(
- -DLAPACK_FOUND=ON
- -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
- )
- fi
- if use atlas; then
- local c=atlas-cblas l=atlas-clapack
- $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
- $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
- mycmakeargs+=(
- -DCBLAS_FOUND=ON
- -DCLAPACK_FOUND=ON
- -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
- -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
- -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
- -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
- )
- fi
- cmake-utils_src_configure
-}
-
-src_test() {
- pushd examples > /dev/null
- emake CXXFLAGS="-I../include ${CXXFLAGS}" EXTRA_LIB_FLAGS="-L.."
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
- emake clean
- popd > /dev/null
-}
-
-src_install() {
- cmake-utils_src_install
- dodoc README.txt
- use doc && dodoc *pdf && dohtml *html
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/sci-libs/armadillo/armadillo-4.100.2.ebuild b/sci-libs/armadillo/armadillo-4.100.2.ebuild
deleted file mode 100644
index 6dab248..0000000
--- a/sci-libs/armadillo/armadillo-4.100.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils toolchain-funcs multilib eutils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0/4"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test"
-REQUIRED_USE="test? ( lapack )"
-
-RDEPEND="
- dev-libs/boost
- arpack? ( sci-libs/arpack )
- atlas? ( sci-libs/atlas[lapack] )
- blas? ( virtual/blas )
- lapack? ( virtual/lapack )"
-DEPEND="${RDEPEND}
- arpack? ( virtual/pkgconfig )
- atlas? ( virtual/pkgconfig )
- blas? ( virtual/pkgconfig )
- hdf5? ( sci-libs/hdf5 )
- lapack? ( virtual/pkgconfig )
- mkl? ( sci-libs/mkl )
- tbb? ( dev-cpp/tbb )"
-PDEPEND="${RDEPEND}
- hdf5? ( sci-libs/hdf5 )
- mkl? ( sci-libs/mkl )
- tbb? ( dev-cpp/tbb )"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-4.000.3-hdf5.patch \
- "${FILESDIR}"/${PN}-3.820.1-example-makefile.patch
- # avoid the automagic cmake macros
- sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
- $(cmake-utils_use debug ARMA_EXTRA_DEBUG)
- $(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
- $(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
- )
- if use arpack; then
- mycmakeargs+=(
- -DARPACK_FOUND=ON
- -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
- )
- fi
- if use atlas; then
- local c=atlas-cblas l=atlas-clapack
- $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
- $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
- mycmakeargs+=(
- -DCBLAS_FOUND=ON
- -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
- -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
- -DCLAPACK_FOUND=ON
- -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
- -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
- )
- fi
- if use blas; then
- mycmakeargs+=(
- -DBLAS_FOUND=ON
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
- )
- fi
- if use hdf5; then
- mycmakeargs+=(
- -DHDF5_FOUND=ON
- -DHDF5_LIBRARIES="-lhdf5"
- )
- fi
- if use lapack; then
- mycmakeargs+=(
- -DLAPACK_FOUND=ON
- -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
- )
- fi
- cmake-utils_src_configure
-}
-
-src_test() {
- pushd examples > /dev/null
- emake \
- CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
- EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
- emake clean
- popd > /dev/null
-}
-
-src_install() {
- cmake-utils_src_install
- dodoc README.txt
- use doc && dodoc *pdf && dohtml *html
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/sci-libs/armadillo/armadillo-4.300.0.ebuild b/sci-libs/armadillo/armadillo-4.300.8.ebuild
similarity index 100%
rename from sci-libs/armadillo/armadillo-4.300.0.ebuild
rename to sci-libs/armadillo/armadillo-4.300.8.ebuild
diff --git a/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch b/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch
deleted file mode 100644
index f294e7b..0000000
--- a/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- CMakeLists.txt.orig 2013-05-24 21:14:49.626395820 -0700
-+++ CMakeLists.txt 2013-05-24 21:15:10.724511364 -0700
-@@ -222,11 +222,11 @@
- # find_package(HDF5)
- # message(STATUS "HDF5_FOUND = ${HDF5_FOUND}")
- #
--# if(HDF5_FOUND)
--# set(ARMA_USE_HDF5 true)
--# set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
--# set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
--# endif()
-+if(HDF5_FOUND)
-+ set(ARMA_USE_HDF5 true)
-+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
-+ set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
-+endif()
- # endif()
-
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/, sci-libs/armadillo/files/
@ 2014-02-16 12:55 Reinis Danne
0 siblings, 0 replies; 6+ messages in thread
From: Reinis Danne @ 2014-02-16 12:55 UTC (permalink / raw
To: gentoo-commits
commit: 15b26e1e99139b59bfb7471e382044235e8dec91
Author: Reinis Danne <rei4dan <AT> gmail <DOT> com>
AuthorDate: Sun Feb 16 12:51:00 2014 +0000
Commit: Reinis Danne <rei4dan <AT> gmail <DOT> com>
CommitDate: Sun Feb 16 12:51:00 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=15b26e1e
Revert "Merge pull request #191 from Reinis/arma_no_wrapper"
This reverts commit 5ed90a02f0196b790d969b2f26dfc7a3462f453b, reversing
changes made to aeccee21a18a8326fb3868dc1745b5e6d266e67c.
I was pointed out that armadillo-4 already has this implemented with
ARMA_DONT_USE_WRAPPER.
---
sci-libs/armadillo/ChangeLog | 4 ----
sci-libs/armadillo/armadillo-4.000.3.ebuild | 1 -
sci-libs/armadillo/files/armadillo-opt_wrapper.patch | 15 ---------------
3 files changed, 20 deletions(-)
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 5d0748c..e28dc78 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,10 +2,6 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
- 14 Feb 2014; Reinis Danne <rei4dan@gmail.com> armadillo-4.000.3.ebuild,
- +files/armadillo-opt_wrapper.patch:
- Add patch to make the wrapper optional at consumer compile time.
-
10 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> armadillo-4.000.3.ebuild:
sci-libs/armadillo: removed int64 flag, it is only for revdep at compile time
diff --git a/sci-libs/armadillo/armadillo-4.000.3.ebuild b/sci-libs/armadillo/armadillo-4.000.3.ebuild
index c17fbf2..6dab248 100644
--- a/sci-libs/armadillo/armadillo-4.000.3.ebuild
+++ b/sci-libs/armadillo/armadillo-4.000.3.ebuild
@@ -40,7 +40,6 @@ PDEPEND="${RDEPEND}
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-4.000.3-hdf5.patch \
- "${FILESDIR}"/${PN}-opt_wrapper.patch \
"${FILESDIR}"/${PN}-3.820.1-example-makefile.patch
# avoid the automagic cmake macros
sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
diff --git a/sci-libs/armadillo/files/armadillo-opt_wrapper.patch b/sci-libs/armadillo/files/armadillo-opt_wrapper.patch
deleted file mode 100644
index be5b386..0000000
--- a/sci-libs/armadillo/files/armadillo-opt_wrapper.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- include/armadillo_bits/config.hpp.cmake 2014-02-14 02:22:31.792051878 +0200
-+++ include/armadillo_bits/config.hpp.cmake 2014-02-14 02:24:56.423587416 +0200
-@@ -29,10 +29,12 @@
- //// ARPACK is required for eigendecompositions of sparse matrices, eg. eigs_sym()
- #endif
-
-+#if !defined(ARMA_NO_WRAPPER)
- #cmakedefine ARMA_USE_WRAPPER
- //// Comment out the above line if you're getting linking errors when compiling your programs,
- //// or if you prefer to directly link with LAPACK, BLAS or ARPACK.
- //// You will then need to link your programs directly with -llapack -lblas instead of -larmadillo
-+#endif
-
- // #define ARMA_BLAS_CAPITALS
- //// Uncomment the above line if your BLAS and LAPACK libraries have capitalised function names (eg. ACML on 64-bit Windows)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/, sci-libs/armadillo/files/
@ 2014-02-16 12:55 Reinis Danne
0 siblings, 0 replies; 6+ messages in thread
From: Reinis Danne @ 2014-02-16 12:55 UTC (permalink / raw
To: gentoo-commits
commit: dd742fe61965e5ab01b7af471620a5c37b22ea18
Author: Reinis Danne <rei4dan <AT> gmail <DOT> com>
AuthorDate: Fri Feb 14 13:51:30 2014 +0000
Commit: Reinis Danne <rei4dan <AT> gmail <DOT> com>
CommitDate: Fri Feb 14 13:51:30 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=dd742fe6
sci-libs/armadillo: Add patch with option to disable wrapper
With this programs can be built only against armadillo headers and
linked directly to math libraries by using -DARMA_NO_WRAPPER at compile
time.
---
sci-libs/armadillo/ChangeLog | 4 ++++
sci-libs/armadillo/armadillo-4.000.3.ebuild | 1 +
sci-libs/armadillo/files/armadillo-opt_wrapper.patch | 15 +++++++++++++++
3 files changed, 20 insertions(+)
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index e28dc78..5d0748c 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 14 Feb 2014; Reinis Danne <rei4dan@gmail.com> armadillo-4.000.3.ebuild,
+ +files/armadillo-opt_wrapper.patch:
+ Add patch to make the wrapper optional at consumer compile time.
+
10 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> armadillo-4.000.3.ebuild:
sci-libs/armadillo: removed int64 flag, it is only for revdep at compile time
diff --git a/sci-libs/armadillo/armadillo-4.000.3.ebuild b/sci-libs/armadillo/armadillo-4.000.3.ebuild
index 6dab248..c17fbf2 100644
--- a/sci-libs/armadillo/armadillo-4.000.3.ebuild
+++ b/sci-libs/armadillo/armadillo-4.000.3.ebuild
@@ -40,6 +40,7 @@ PDEPEND="${RDEPEND}
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-4.000.3-hdf5.patch \
+ "${FILESDIR}"/${PN}-opt_wrapper.patch \
"${FILESDIR}"/${PN}-3.820.1-example-makefile.patch
# avoid the automagic cmake macros
sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
diff --git a/sci-libs/armadillo/files/armadillo-opt_wrapper.patch b/sci-libs/armadillo/files/armadillo-opt_wrapper.patch
new file mode 100644
index 0000000..be5b386
--- /dev/null
+++ b/sci-libs/armadillo/files/armadillo-opt_wrapper.patch
@@ -0,0 +1,15 @@
+--- include/armadillo_bits/config.hpp.cmake 2014-02-14 02:22:31.792051878 +0200
++++ include/armadillo_bits/config.hpp.cmake 2014-02-14 02:24:56.423587416 +0200
+@@ -29,10 +29,12 @@
+ //// ARPACK is required for eigendecompositions of sparse matrices, eg. eigs_sym()
+ #endif
+
++#if !defined(ARMA_NO_WRAPPER)
+ #cmakedefine ARMA_USE_WRAPPER
+ //// Comment out the above line if you're getting linking errors when compiling your programs,
+ //// or if you prefer to directly link with LAPACK, BLAS or ARPACK.
+ //// You will then need to link your programs directly with -llapack -lblas instead of -larmadillo
++#endif
+
+ // #define ARMA_BLAS_CAPITALS
+ //// Uncomment the above line if your BLAS and LAPACK libraries have capitalised function names (eg. ACML on 64-bit Windows)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/, sci-libs/armadillo/files/
@ 2014-02-10 4:14 Sebastien Fabbro
0 siblings, 0 replies; 6+ messages in thread
From: Sebastien Fabbro @ 2014-02-10 4:14 UTC (permalink / raw
To: gentoo-commits
commit: 36897fb005324e6cb1abb63c9257766987313576
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 9 19:25:37 2014 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Sun Feb 9 19:25:37 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=36897fb0
sci-libs/armadillo: Version bump
Package-Manager: portage-2.2.8-prefix
---
sci-libs/armadillo/ChangeLog | 6 ++
sci-libs/armadillo/armadillo-4.000.3.ebuild | 109 +++++++++++++++++++++
.../armadillo/files/armadillo-4.000.3-hdf5.patch | 19 ++++
3 files changed, 134 insertions(+)
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 98a692c..721a0a1 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*armadillo-4.000.3 (09 Feb 2014)
+
+ 09 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-4.000.3.ebuild,
+ +files/armadillo-4.000.3-hdf5.patch:
+ sci-libs/armadillo: Version bump
+
08 Feb 2014; Reinis Danne <rei4dan@gmail.com> armadillo-3.930.0.ebuild:
Fix cblas, clapack include dir.
diff --git a/sci-libs/armadillo/armadillo-4.000.3.ebuild b/sci-libs/armadillo/armadillo-4.000.3.ebuild
new file mode 100644
index 0000000..7b82540
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-4.000.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake-utils toolchain-funcs multilib eutils
+
+DESCRIPTION="Streamlined C++ linear algebra library"
+HOMEPAGE="http://arma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack atlas blas debug doc examples hdf5 int64 lapack mkl tbb test"
+REQUIRED_USE="test? ( lapack )"
+
+RDEPEND="
+ dev-libs/boost
+ arpack? ( sci-libs/arpack )
+ atlas? ( sci-libs/atlas[lapack] )
+ blas? ( virtual/blas )
+ lapack? ( virtual/lapack )"
+DEPEND="${RDEPEND}
+ arpack? ( virtual/pkgconfig )
+ atlas? ( virtual/pkgconfig )
+ blas? ( virtual/pkgconfig )
+ hdf5? ( sci-libs/hdf5 )
+ lapack? ( virtual/pkgconfig )
+ mkl? ( sci-libs/mkl )
+ tbb? ( dev-cpp/tbb )"
+PDEPEND="${RDEPEND}
+ hdf5? ( sci-libs/hdf5 )
+ mkl? ( sci-libs/mkl )
+ tbb? ( dev-cpp/tbb )"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${PN}-4.000.3-hdf5.patch \
+ "${FILESDIR}"/${PN}-3.820.1-example-makefile.patch
+ # avoid the automagic cmake macros
+ sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+ $(cmake-utils_use debug ARMA_EXTRA_DEBUG)
+ $(cmake-utils_use int64 ARMA_64BIT_WORD)
+ $(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
+ $(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
+ )
+ if use arpack; then
+ mycmakeargs+=(
+ -DARPACK_FOUND=ON
+ -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
+ )
+ fi
+ if use blas; then
+ mycmakeargs+=(
+ -DBLAS_FOUND=ON
+ -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+ )
+ fi
+ if use lapack; then
+ mycmakeargs+=(
+ -DLAPACK_FOUND=ON
+ -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+ )
+ fi
+ if use atlas; then
+ local c=atlas-cblas l=atlas-clapack
+ $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
+ $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
+ mycmakeargs+=(
+ -DCBLAS_FOUND=ON
+ -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
+ -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
+ -DCLAPACK_FOUND=ON
+ -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
+ -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
+ )
+ fi
+ cmake-utils_src_configure
+}
+
+src_test() {
+ pushd examples > /dev/null
+ emake \
+ CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
+ EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
+ LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
+ LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
+ emake clean
+ popd > /dev/null
+}
+
+src_install() {
+ cmake-utils_src_install
+ dodoc README.txt
+ use doc && dodoc *pdf && dohtml *html
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/sci-libs/armadillo/files/armadillo-4.000.3-hdf5.patch b/sci-libs/armadillo/files/armadillo-4.000.3-hdf5.patch
new file mode 100644
index 0000000..4510cd8
--- /dev/null
+++ b/sci-libs/armadillo/files/armadillo-4.000.3-hdf5.patch
@@ -0,0 +1,19 @@
+--- armadillo-4.000.2/CMakeLists.txt.orig 2014-02-03 14:47:35.023255183 -0800
++++ armadillo-4.000.2/CMakeLists.txt 2014-02-03 21:19:47.567376544 -0800
+@@ -227,11 +227,11 @@
+ # find_package(HDF5)
+ # message(STATUS "HDF5_FOUND = ${HDF5_FOUND}")
+ #
+-# if(HDF5_FOUND)
+-# set(ARMA_USE_HDF5 true)
+-# set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
+-# set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
+-# endif()
++if(HDF5_FOUND)
++ set(ARMA_USE_HDF5 true)
++ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
++ set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
++ endif()
+
+
+ include(ARMA_FindARPACK)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/, sci-libs/armadillo/files/
@ 2013-04-29 16:32 Sebastien Fabbro
0 siblings, 0 replies; 6+ messages in thread
From: Sebastien Fabbro @ 2013-04-29 16:32 UTC (permalink / raw
To: gentoo-commits
commit: 0d1553c53e3ace23b3d32ca4d8d315415b30f728
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 16:21:28 2013 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 16:21:28 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0d1553c5
sci-libs/armadillo: Version bump
Package-Manager: portage-2.2.01.21890-prefix
RepoMan-Options: --force
---
sci-libs/armadillo/ChangeLog | 7 ++++
...lo-3.6.3-r1.ebuild => armadillo-3.810.2.ebuild} | 35 +++++++++++++++----
.../files/armadillo-3.810.2-example-makefile.patch | 33 ++++++++++++++++++
.../armadillo/files/armadillo-3.810.2-hdf5.patch | 19 +++++++++++
sci-libs/armadillo/metadata.xml | 20 ++++++++---
5 files changed, 101 insertions(+), 13 deletions(-)
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 71af4a9..ac1aaf0 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*armadillo-3.810.2 (29 Apr 2013)
+
+ 29 Apr 2013; Sébastien Fabbro <bicatali@gentoo.org> +armadillo-3.810.2.ebuild,
+ +files/armadillo-3.810.2-example-makefile.patch,
+ +files/armadillo-3.810.2-hdf5.patch, -armadillo-3.6.3-r1.ebuild, metadata.xml:
+ sci-libs/armadillo: Version bump
+
28 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org> armadillo-3.6.3-r1.ebuild:
sci-libs/armadillo: Small prefix fix
diff --git a/sci-libs/armadillo/armadillo-3.6.3-r1.ebuild b/sci-libs/armadillo/armadillo-3.810.2.ebuild
similarity index 60%
rename from sci-libs/armadillo/armadillo-3.6.3-r1.ebuild
rename to sci-libs/armadillo/armadillo-3.810.2.ebuild
index 0258f25..84523a3 100644
--- a/sci-libs/armadillo/armadillo-3.6.3-r1.ebuild
+++ b/sci-libs/armadillo/armadillo-3.810.2.ebuild
@@ -6,16 +6,16 @@ EAPI=5
CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils toolchain-funcs multilib
+inherit cmake-utils toolchain-funcs multilib eutils
DESCRIPTION="Streamlined C++ linear algebra library"
HOMEPAGE="http://arma.sourceforge.net/"
SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
-LICENSE="LGPL-3"
+LICENSE="MPL-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="atlas blas doc examples lapack"
+IUSE="atlas blas debug doc examples hdf5 int64 lapack tbb"
RDEPEND="
dev-libs/boost
@@ -26,14 +26,24 @@ DEPEND="${DEPEND}
atlas? ( virtual/pkgconfig )
blas? ( virtual/pkgconfig )
lapack? ( virtual/pkgconfig )"
+PDEPEND="${RDEPEND}
+ hdf5? ( sci-libs/hdf5 )
+ tbb? ( dev-cpp/tbb )"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-{hdf5,example-makefile}.patch
# avoid the automagic cmake macros
sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
}
src_configure() {
- local mycmakeargs=( -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" )
+ local mycmakeargs=(
+ -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+ $(cmake-utils_use debug ARMA_EXTRA_DEBUG)
+ $(cmake-utils_use hdf5 ARMA_USE_HDF5)
+ $(cmake-utils_use int64 ARMA_64BIT_WORD)
+ $(cmake-utils_use tbb ARMA_TBB_ALLOC)
+ )
if use blas; then
mycmakeargs+=(
-DBLAS_FOUND=ON
@@ -47,10 +57,10 @@ src_configure() {
)
fi
if use atlas; then
- local c=atlas-cblas l=atlas-lapack
- $(tc-getPKG_CONFIG) --exists atlas-cblas-threads && c+=-threads
- $(tc-getPKG_CONFIG) --exists atlas-lapack-threads && l+=-threads
- mycmakeargs=(
+ local c=atlas-cblas l=atlas-clapack
+ $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
+ $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
+ mycmakeargs+=(
-DCBLAS_FOUND=ON
-DCLAPACK_FOUND=ON
-DATLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags ${c} | sed 's/-I//')"
@@ -61,6 +71,15 @@ src_configure() {
cmake-utils_src_configure
}
+src_test() {
+ pushd examples > /dev/null
+ emake CXXFLAGS="-I../include ${CXXFLAGS}" EXTRA_LIB_FLAGS="-L.."
+ LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
+ LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
+ emake clean
+ popd > /dev/null
+}
+
src_install() {
cmake-utils_src_install
dodoc README.txt
diff --git a/sci-libs/armadillo/files/armadillo-3.810.2-example-makefile.patch b/sci-libs/armadillo/files/armadillo-3.810.2-example-makefile.patch
new file mode 100644
index 0000000..90169ed
--- /dev/null
+++ b/sci-libs/armadillo/files/armadillo-3.810.2-example-makefile.patch
@@ -0,0 +1,33 @@
+--- examples/Makefile.cmake.orig 2013-04-29 09:13:58.164963641 -0700
++++ examples/Makefile.cmake 2013-04-29 09:18:42.371460644 -0700
+@@ -1,7 +1,7 @@
+ # The generated "Makefile" from "Makefile.cmake" is only usable after
+ # the Armadillo library has been configured and installed by CMake.
+
+-CXX=g++
++CXX:=g++
+ #CXX=g++-4.2
+ ## Under MacOS you may have an old compiler as default (e.g. GCC 4.0).
+ ## However, GCC 4.2 or later is available and preferable due to better
+@@ -26,7 +26,7 @@
+
+
+
+-LIB_FLAGS = -larmadillo $(EXTRA_LIB_FLAGS)
++LIB_FLAGS = $(EXTRA_LIB_FLAGS) -larmadillo
+ ## NOTE: on Ubuntu and Debian based systems you may need to add
+ ## -lgfortran to LIB_FLAGS
+
+@@ -73,10 +73,10 @@
+ all: example1 example2
+
+ example1: example1.cpp
+- $(CXX) $(CXXFLAGS) -o $@ $< $(LIB_FLAGS)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $< $(LIB_FLAGS) -o $@
+
+ example2: example2.cpp
+- $(CXX) $(CXXFLAGS) -o $@ $< $(LIB_FLAGS)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) $< $(LIB_FLAGS) -o $@
+
+
+ .PHONY: clean
diff --git a/sci-libs/armadillo/files/armadillo-3.810.2-hdf5.patch b/sci-libs/armadillo/files/armadillo-3.810.2-hdf5.patch
new file mode 100644
index 0000000..1d2e2ff
--- /dev/null
+++ b/sci-libs/armadillo/files/armadillo-3.810.2-hdf5.patch
@@ -0,0 +1,19 @@
+--- CMakeLists.txt.orig 2013-02-28 14:51:42.032554805 -0800
++++ CMakeLists.txt 2013-02-28 14:53:05.730978799 -0800
+@@ -191,11 +191,11 @@
+ # find_package(HDF5)
+ # message(STATUS "HDF5_FOUND = ${HDF5_FOUND}")
+ #
+-# if(HDF5_FOUND)
+-# set(ARMA_USE_HDF5 true)
+-# set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
+-# set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
+-# endif()
++if(HDF5_FOUND)
++ set(ARMA_USE_HDF5 true)
++ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS})
++ set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES})
++endif()
+
+ message(STATUS "*** ")
+ message(STATUS "*** The Armadillo run-time library component will be an alias for the following libraries:")
diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index 3581e19..ec31109 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
- <longdescription lang="en">
+<herd>sci</herd>
+<longdescription lang="en">
Armadillo is a C++ linear algebra library (matrix maths) aiming
towards a good balance between speed and ease of use. Integer,
floating point and complex numbers are supported, as well as a
@@ -14,7 +14,17 @@
need for temporaries. This is accomplished through recursive
templates and template meta-programming.
</longdescription>
- <use>
- <flag name="atlas">Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and clapack</flag>
- </use>
+<use>
+ <flag name="atlas">
+ Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and
+ clapack
+ </flag>
+ <flag name='int64'>
+ Use 64 bits integer for matrix indexation
+ </flag>
+ <flag name='tbb'>
+ Use matrix allocation from the Threads Building Blocks
+ <pkg>dev-cpp/tbb</pkg>
+ </flag>
+</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-06-09 16:36 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-25 4:40 [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/, sci-libs/armadillo/files/ Sebastien Fabbro
-- strict thread matches above, loose matches on Subject: below --
2014-06-09 16:36 Sebastien Fabbro
2014-02-16 12:55 Reinis Danne
2014-02-16 12:55 Reinis Danne
2014-02-10 4:14 Sebastien Fabbro
2013-04-29 16:32 Sebastien Fabbro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox