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 66C7213838B for ; Mon, 6 Oct 2014 05:56:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB759E0B00; Mon, 6 Oct 2014 05:56:44 +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 A2B1AE0B00 for ; Mon, 6 Oct 2014 05:56:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C68B23402C3 for ; Mon, 6 Oct 2014 05:56:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E29FC71B3 for ; Mon, 6 Oct 2014 05:56:38 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1411818030.cbbbed04e53145c0b018be3b16b495c682537b23.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/lapack-reference/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/lapack-reference/ChangeLog sci-libs/lapack-reference/lapack-reference-9999.ebuild X-VCS-Directories: sci-libs/lapack-reference/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: cbbbed04e53145c0b018be3b16b495c682537b23 X-VCS-Branch: master Date: Mon, 6 Oct 2014 05:56:38 +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: 24029c60-9f0b-4d62-bd2f-1959ed42b924 X-Archives-Hash: f84998cc01cf2f28f2801684eb89883f commit: cbbbed04e53145c0b018be3b16b495c682537b23 Author: gienah gentoo org> AuthorDate: Sat Sep 27 11:40:30 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Sep 27 11:40:30 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cbbbed04 Fix rebase lapack-multibuild to master conflict 11 on sci-libs/lapack-reference --- sci-libs/lapack-reference/ChangeLog | 5 +++++ sci-libs/lapack-reference/lapack-reference-9999.ebuild | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog index 6fbd2ea..85c2139 100644 --- a/sci-libs/lapack-reference/ChangeLog +++ b/sci-libs/lapack-reference/ChangeLog @@ -11,6 +11,11 @@ lapack-reference-9999.ebuild: Add xblas to the .pc file when it is in use see bug#523388 + 07 Sep 2014; Mark Wright lapack-reference-9999.ebuild: + Remove the lines changing the setting of the FC and F77 environment + variables, instead pass the $(get_abi_CFLAGS) to cmake in the setting of the + -DCMAKE_Fortran_FLAGS variable. + 26 Apr 2014; Mark Wright lapack-reference-9999.ebuild: Add >=virtual/blas-2.1-r2[int64?] and >=virtual/lapack-3.5-r2[int64?] to RDEPEND. Use separate eselect modules for lapack and lapack-int64. diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild index 17f3a04..e2ef959 100644 --- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild +++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild @@ -114,8 +114,6 @@ _int64_multilib_multibuild_wrapper() { local v="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}" local ABI="${v/_${STATIC_SUFFIX}/}" multilib_toolchain_setup "${ABI}" - export FC="$(tc-getFC) $(get_abi_CFLAGS)" - export F77="$(tc-getF77) $(get_abi_CFLAGS)" "${@}" } @@ -175,12 +173,12 @@ src_configure() { ) if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then mycmakeargs+=( - -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) -fdefault-integer-8" + -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS) -fdefault-integer-8" -DLAPACK_PKGCONFIG_FFLAGS="-fdefault-integer-8" ) else mycmakeargs+=( - -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname})" + -DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags ${blas_profname}) $(get_abi_CFLAGS)" -DLAPACK_PKGCONFIG_FFLAGS="" ) fi