From 479bf4dcda9314baa4531a799c0746879072c5a7 Mon Sep 17 00:00:00 2001 From: Sebastien Fabbro Date: Tue, 6 Mar 2007 10:06:04 +0000 Subject: [PATCH] don't check for cblas when flag lapack unused. allows F77FLAGS. Package-Manager: portage-2.1.2-r9 --- dev-python/numpy/ChangeLog | 7 ++++++- dev-python/numpy/Manifest | 22 +++++++++++----------- dev-python/numpy/numpy-1.0.1-r1.ebuild | 20 +++++++++++--------- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog index f507c36b3a7c..5b23dc2267fe 100644 --- a/dev-python/numpy/ChangeLog +++ b/dev-python/numpy/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-python/numpy # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.20 2007/03/05 10:39:09 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.21 2007/03/06 10:06:04 bicatali Exp $ + + 06 Mar 2007; Sébastien Fabbro + numpy-1.0.1-r1.ebuild: + Fixed a cblas requirement when lapack was not called. Allows F77FLAGS to + be used along FFLAGS for FORTRAN flags. 05 Mar 2007; Sébastien Fabbro +files/numpy-1.0.1-cpuinfo.patch, numpy-1.0.1-r1.ebuild: diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index ce20eff61ce4..f1ce4a2164e3 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -15,18 +15,18 @@ EBUILD numpy-0.9.8.ebuild 1557 RMD160 536add2de5a6c0fe7ac2a1ef39788b074bfb0b0b S MD5 77c55bc35c89e312fd945a4ffdbfaaa0 numpy-0.9.8.ebuild 1557 RMD160 536add2de5a6c0fe7ac2a1ef39788b074bfb0b0b numpy-0.9.8.ebuild 1557 SHA256 6149347b0833687ffc279ac04eb163ac004363308e047f27fbd10b4a718a4458 numpy-0.9.8.ebuild 1557 -EBUILD numpy-1.0.1-r1.ebuild 3846 RMD160 ec1ad005b6494e9c3c91dcd27b6ead11ea0abdaf SHA1 e0f9a074326de02d3e40b6ebd32e4ecda85c426e SHA256 49a31a0d11ff6b5a534e838b016f38f94372468d8536009363d6a41c4b974b55 -MD5 0b3f3b5cf45c96f43b9fbb15cd35e45d numpy-1.0.1-r1.ebuild 3846 -RMD160 ec1ad005b6494e9c3c91dcd27b6ead11ea0abdaf numpy-1.0.1-r1.ebuild 3846 -SHA256 49a31a0d11ff6b5a534e838b016f38f94372468d8536009363d6a41c4b974b55 numpy-1.0.1-r1.ebuild 3846 +EBUILD numpy-1.0.1-r1.ebuild 3927 RMD160 78d12895d75ab59b0bf4a592f76bd68c97aa938d SHA1 2d59302a39b9be9877b143f194b1cd315529b3f1 SHA256 b0b3a483a1066052c215e8bd1d1d96eea020f5c46b0f90afa7fb3151fa9e3a1c +MD5 b8a2969e1dbd37c1324a1aa662c9837b numpy-1.0.1-r1.ebuild 3927 +RMD160 78d12895d75ab59b0bf4a592f76bd68c97aa938d numpy-1.0.1-r1.ebuild 3927 +SHA256 b0b3a483a1066052c215e8bd1d1d96eea020f5c46b0f90afa7fb3151fa9e3a1c numpy-1.0.1-r1.ebuild 3927 EBUILD numpy-1.0.1.ebuild 2271 RMD160 fd436cc29e0389f1d2246a9340c23024246f0ecb SHA1 a5b046c89bb968a92c323c5f9dabd6438451f5cd SHA256 067aff264eccb0d9465715a91960c9f070ea04c1b1f1bd4500800aaec56a6af1 MD5 62f4ec838aed7d95ba701c229ef98964 numpy-1.0.1.ebuild 2271 RMD160 fd436cc29e0389f1d2246a9340c23024246f0ecb numpy-1.0.1.ebuild 2271 SHA256 067aff264eccb0d9465715a91960c9f070ea04c1b1f1bd4500800aaec56a6af1 numpy-1.0.1.ebuild 2271 -MISC ChangeLog 3795 RMD160 e4935d4f19df9474d918623378dde5906f1b2859 SHA1 a45261f0c12f2c552bcbfb3db697aa0366959240 SHA256 a185bc3ffb33d658e47b7bdb6671ba30b59f5e225ac80f94f0270d90cdc08b5f -MD5 cb5910568afa8e3e8b85c6f5bef23ba7 ChangeLog 3795 -RMD160 e4935d4f19df9474d918623378dde5906f1b2859 ChangeLog 3795 -SHA256 a185bc3ffb33d658e47b7bdb6671ba30b59f5e225ac80f94f0270d90cdc08b5f ChangeLog 3795 +MISC ChangeLog 3994 RMD160 e3476acbfc5fc0d98693c7280696039a88549623 SHA1 366e8a95ceed4dbed25031d88cf33fa935f4d654 SHA256 b1a667becce2e678dc3e14f90fa1551a0ab0e08acbec54cd848ad789fe62fec5 +MD5 c0ef9177b3991f99953867ace74affe5 ChangeLog 3994 +RMD160 e3476acbfc5fc0d98693c7280696039a88549623 ChangeLog 3994 +SHA256 b1a667becce2e678dc3e14f90fa1551a0ab0e08acbec54cd848ad789fe62fec5 ChangeLog 3994 MISC metadata.xml 747 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 SHA1 c2580aa1116f9f96b8d7901ab95b37a653d0fc56 SHA256 2c7d10dc62b47ddf32f41edffc9994655225654fcf8a72052c24f7d7235c5640 MD5 d623311ce8175e55bcb5e2a9750b5cd4 metadata.xml 747 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 metadata.xml 747 @@ -43,7 +43,7 @@ SHA256 683c8162153610de363d0aa90c583e5e83f4bb8fc815d6e0310c43f76cc19faa files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFF6/NXWc/Ciu+QQGkRAsa/AJsEQTYJ185/8loD+xu9B/FWvCkucQCgh86R -KY4ZtrAx9apUrLQ7H+zZwXU= -=lk7s +iD8DBQFF7T0VWc/Ciu+QQGkRAs3WAJ9v2/H66jVRda0y9fzXnhWoXVe5hgCfZU0H +cdJf130wiOvubFR0EECTe1o= +=GFeP -----END PGP SIGNATURE----- diff --git a/dev-python/numpy/numpy-1.0.1-r1.ebuild b/dev-python/numpy/numpy-1.0.1-r1.ebuild index 458fa1d38d13..f5c53f3ee6e2 100644 --- a/dev-python/numpy/numpy-1.0.1-r1.ebuild +++ b/dev-python/numpy/numpy-1.0.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.1-r1.ebuild,v 1.3 2007/03/05 10:39:09 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.1-r1.ebuild,v 1.4 2007/03/06 10:06:04 bicatali Exp $ NEED_PYTHON=2.3 @@ -30,15 +30,17 @@ FORTRAN="g77 gfortran" numpy_configure() { local mycblas - for d in $(eselect cblas show); do mycblas=${d}; done - if [[ -z "${mycblas/reference/}" ]] && [[ -z "${mycblas/atlas/}" ]]; then - ewarn "You need to set cblas to atlas or reference. Do:" - ewarn " eselect cblas set " - ewarn "where is atlas, threaded-atlas or reference" - die "setup failed" + if use lapack; then + for d in $(eselect cblas show); do mycblas=${d}; done + if [[ -z "${mycblas/reference/}" ]] && [[ -z "${mycblas/atlas/}" ]]; then + ewarn "You need to set cblas to atlas or reference. Do:" + ewarn " eselect cblas set " + ewarn "where is atlas, threaded-atlas or reference" + die "setup failed" + fi fi - - [[ -z "${FFLAGS}" ]] && FFLAGS="${CFLAGS}" + [[ -z "${F77FLAGS}" ]] && F77FLAGS="${CFLAGS}" + [[ -z "${FFLAGS}" ]] && FFLAGS="${F77FLAGS}" # remove default values echo "# gentoo config" > site.cfg -- 2.26.2