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 0806D138BF3 for ; Sun, 16 Feb 2014 12:55:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7BDDE0A8C; 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 2D2F9E0A8C for ; Sun, 16 Feb 2014 12:55:09 +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 32C6D33EE64 for ; Sun, 16 Feb 2014 12:55:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 0074B188CA for ; Sun, 16 Feb 2014 12:55:07 +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: <1392555060.15b26e1e99139b59bfb7471e382044235e8dec91.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: 15b26e1e99139b59bfb7471e382044235e8dec91 X-VCS-Branch: master Date: Sun, 16 Feb 2014 12:55:07 +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: 313a4503-3daf-4766-be37-6cc456109794 X-Archives-Hash: 778a1f28adf622b97fa62c6d2e4e8e73 commit: 15b26e1e99139b59bfb7471e382044235e8dec91 Author: Reinis Danne gmail com> AuthorDate: Sun Feb 16 12:51:00 2014 +0000 Commit: Reinis Danne gmail 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 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 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)