From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 88596138E2E for ; Sun, 16 Feb 2014 12:55:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7827EE0AA1; Sun, 16 Feb 2014 12:55:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8AA31E0A8C for ; Sun, 16 Feb 2014 12:55:08 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C8D033E1C2 for ; Sun, 16 Feb 2014 12:55:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id DF03C1872B for ; Sun, 16 Feb 2014 12:55:05 +0000 (UTC) From: "Reinis Danne" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Reinis Danne" Message-ID: <1392385890.dd742fe61965e5ab01b7af471620a5c37b22ea18.rei4dan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/, sci-libs/armadillo/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/armadillo/ChangeLog sci-libs/armadillo/armadillo-4.000.3.ebuild sci-libs/armadillo/files/armadillo-opt_wrapper.patch X-VCS-Directories: sci-libs/armadillo/ sci-libs/armadillo/files/ X-VCS-Committer: rei4dan X-VCS-Committer-Name: Reinis Danne X-VCS-Revision: dd742fe61965e5ab01b7af471620a5c37b22ea18 X-VCS-Branch: master Date: Sun, 16 Feb 2014 12:55:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b8041e7c-39e8-475a-933e-d367dec569c1 X-Archives-Hash: f1fa001d82ccc586a08f9e65e4fb588b commit: dd742fe61965e5ab01b7af471620a5c37b22ea18 Author: Reinis Danne gmail com> AuthorDate: Fri Feb 14 13:51:30 2014 +0000 Commit: Reinis Danne gmail 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 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 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)