From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1JHyEq-0002pe-EK for garchives@archives.gentoo.org; Thu, 24 Jan 2008 09:19:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53CE3E0591; Thu, 24 Jan 2008 09:19:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0D0D9E0591 for ; Thu, 24 Jan 2008 09:19:11 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 9DF50655B8 for ; Thu, 24 Jan 2008 09:19:10 +0000 (UTC) Received: from bicatali by stork.gentoo.org with local (Exim 4.68) (envelope-from ) id 1JHyEn-0001hv-Gi for gentoo-commits@lists.gentoo.org; Thu, 24 Jan 2008 09:19:09 +0000 From: "Sebastien Fabbro (bicatali)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, bicatali@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-python/numpy: ChangeLog numpy-1.0.4-r2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog numpy-1.0.4-r2.ebuild X-VCS-Directories: dev-python/numpy X-VCS-Committer: bicatali X-VCS-Committer-Name: Sebastien Fabbro Content-Type: text/plain; charset=utf8 Message-Id: Sender: Sebastien Fabbro Date: Thu, 24 Jan 2008 09:19:09 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 2e82ae7b-af23-4c42-892c-3a0dd42eb10a X-Archives-Hash: 2acc0cca743a57e237e23f36f12bef0d bicatali 08/01/24 09:19:09 Modified: ChangeLog Added: numpy-1.0.4-r2.ebuild Log: Re-introduce fortran detection but only when lapack flag is set, to pre= vent autodetection and forced multiple fortran linking. Fixed site config= uration file generation to really produce fast blas, some cleaning. (Portage version: 2.1.4) Revision Changes Path 1.50 dev-python/numpy/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/C= hangeLog?rev=3D1.50&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/C= hangeLog?rev=3D1.50&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/C= hangeLog?r1=3D1.49&r2=3D1.50 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ChangeLog 11 Jan 2008 17:06:18 -0000 1.49 +++ ChangeLog 24 Jan 2008 09:19:08 -0000 1.50 @@ -1,6 +1,14 @@ # ChangeLog for dev-python/numpy # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.49 200= 8/01/11 17:06:18 jsbronder Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.50 200= 8/01/24 09:19:08 bicatali Exp $ + +*numpy-1.0.4-r2 (24 Jan 2008) + + 24 Jan 2008; S=C3=A9bastien Fabbro + +numpy-1.0.4-r2.ebuild: + Re-introduce fortran detection but only when lapack flag is set, to pr= event + autodetection and forced multiple fortran linking. Fixed site configur= ation + file generation to really produce fast blas, some cleaning. =20 *numpy-1.0.4-r1 (11 Jan 2008) =20 1.1 dev-python/numpy/numpy-1.0.4-r2.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/n= umpy-1.0.4-r2.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/numpy/n= umpy-1.0.4-r2.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: numpy-1.0.4-r2.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.4-r2.ebuild= ,v 1.1 2008/01/24 09:19:08 bicatali Exp $ NEED_PYTHON=3D2.3 inherit distutils eutils flag-o-matic fortran MY_P=3D${P/_beta/b} MY_P=3D${MY_P/_} DESCRIPTION=3D"Fast array and numerical python library" SRC_URI=3D"mirror://sourceforge/numpy/${MY_P}.tar.gz" HOMEPAGE=3D"http://numeric.scipy.org/" RDEPEND=3D"!dev-python/f2py lapack? ( virtual/cblas virtual/lapack )" DEPEND=3D"${RDEPEND} lapack? ( dev-util/pkgconfig )" IUSE=3D"lapack" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" LICENSE=3D"BSD" S=3D"${WORKDIR}/${MY_P}" # whatever LDFLAGS set will break linking # see progress in http://projects.scipy.org/scipy/numpy/ticket/573 [ -n "${LDFLAGS}" ] && append-ldflags -shared pkg_setup() { # only one fortran to link with: # linking with cblas and lapack library will force # autodetecting and linking to all available fortran compilers use lapack || return FORTRAN=3D"gfortran g77 ifc" fortran_pkg_setup local fc=3D case ${FORTRANC} in gfortran) fc=3Dgnu95 ;; g77) fc=3Dgnu ;; ifc|ifort) if use ia64; then fc=3Dintele elif use amd64; then fc=3Dintelem else fc=3Dintel fi ;; *) eerror "Unknown fortran compiler: ${FORTRANC}" die "numpy_fortran_setup failed" ;; esac # when fortran flags are set, pic is removed. use amd64 && FFLAGS=3D"${FFLAGS} -fPIC" export NUMPY_FCONFIG=3D"config_fc --fcompiler=3D${fc}" } src_unpack() { unpack ${A} cd "${S}" # Fix some paths and docs in f2py epatch "${FILESDIR}"/${PN}-1.0.1-f2py.patch # Patch to use feclearexcept(3) rather than fpsetsticky(3) on FreeBSD 5.= 3+ epatch "${FILESDIR}"/${P}-freebsd.patch # Detect nocona hardware correctly. Bug #183236. epatch "${FILESDIR}"/${P}-nocona-cpuinfo.patch # Gentoo patch for ATLAS library and include dirs sed -i \ -e "s:'f77blas':'blas':g" \ -e "s:'ptf77blas':'blas':g" \ -e "s:'ptcblas':'cblas':g" \ -e "s:'lapack_atlas':'lapack':g" \ -e "s:'atlas\*',:'','atlas\*',:g" \ numpy/distutils/system_info.py \ || die "sed system_info.py failed" cat > site.cfg <<-EOF [DEFAULT] library_dirs =3D /usr/$(get_libdir) include_dirs =3D /usr/include EOF if use lapack; then # cblas and lapack libraries under the name of atlas # otherwise scipy will not create fast _dotblas cat >> site.cfg <<-EOF [atlas] atlas_libs =3D $(pkg-config --libs-only-l cblas lapack \ | sed -e 's/^-l//' -e 's/ -l/,/g') EOF else export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=3DNone fi } src_compile() { # when fortran flags are set, pic is removed but unfortunately needed distutils_src_compile ${NUMPY_FCONFIG} } src_test() { "${python}" setup.py ${NUMPY_FCONFIG} install \ --home=3D"${S}"/test \ --no-compile \ || die "install test failed" pushd "${S}"/test/lib*/python PYTHONPATH=3D. "${python}" -c "import numpy; numpy.test(10,3)" 2>&1 \ | tee test.log grep -q '^OK$' test.log || die "test failed" popd rm -rf test } src_install() { distutils_src_install ${NUMPY_FCONFIG} docinto numpy dodoc numpy/doc/*txt || die "dodoc failed" docinto f2py dodoc numpy/f2py/docs/*txt || die "dodoc f2py failed" doman numpy/f2py/f2py.1 || die "doman failed" } pkg_postinst() { if ! built_with_use sys-devel/gcc fortran && ! has_version dev-lang/ifc;= then ewarn "To use numpy's f2py you need a fortran compiler." ewarn "You can either set USE=3Dfortran flag and re-emerge gcc," ewarn "or emerge dev-lang/ifc" fi } --=20 gentoo-commits@lists.gentoo.org mailing list