public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/atlas/
@ 2011-04-27 20:38 Sebastien Fabbro
  0 siblings, 0 replies; 13+ messages in thread
From: Sebastien Fabbro @ 2011-04-27 20:38 UTC (permalink / raw
  To: gentoo-commits

commit:     82c0e236a4d76456086435fcf33eed2239ff72ac
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 20:37:59 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 20:37:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=82c0e236

bumped atlas

---
 sci-libs/atlas/ChangeLog                           |    6 ++++++
 sci-libs/atlas/Manifest                            |    6 +++---
 .../{atlas-3.9.39.ebuild => atlas-3.9.40.ebuild}   |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
index 66f201c..a0692cf 100644
--- a/sci-libs/atlas/ChangeLog
+++ b/sci-libs/atlas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*atlas-3.9.40 (27 Apr 2011)
+
+  27 Apr 2011; Sébastien Fabbro <bicatali@gentoo.org> -atlas-3.9.39.ebuild,
+  +atlas-3.9.40.ebuild:
+  Bump
+
   15 Apr 2011; Justin Lecher <jlec@gentoo.org> atlas-3.9.39.ebuild:
   Correct syntax for cpufrq check being all CPUs under performance controll
 

diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index ff83e1e..515ab10 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -1,9 +1,9 @@
 AUX 3.9.39-bfr-overflow.patch 2755 RMD160 4f8204eee5b429e9d3db1c211af80396a575fc87 SHA1 9b59bd8a7bb55e7ed4138731262d17532949ece0 SHA256 19cdab39e50e06de0bdc2a080642388fec3a16c826657621f15fc294268d3438
 DIST atlas3.8.3.tar.bz2 2527756 RMD160 0425e630d9d0c5b7aae81427a41b7eaa18447e90 SHA1 c7546210df4796457d9e96a00444adc4c0f2e77f SHA256 e537168f2022db98b9029c8064815b5581620c12d782016138b1bf0bbb01f473
-DIST atlas3.9.39.tar.bz2 5493831 RMD160 118ad28a6dab1633b55a4654a2b67688177dedb7 SHA1 025a62a6577035552cb48aeb45bb4270c3d66580 SHA256 ddb3804d3b2dada955f3b07f8c3b26aff274aaaa2de2211a15309aa892bc5c83
+DIST atlas3.9.40.tar.bz2 5483901 RMD160 8cb7568a287f063c133a7272593706a38ef20648 SHA1 b7463a47bd5ea0a3da497a1bb1c37960d2002a1b SHA256 7cb889d17d20d2224b1c3a811306fe0060de2435b2527a79025396b260ec9fec
 DIST lapack-3.3.0.tgz 6064824 RMD160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e SHA1 4f0b103da52110e7f60d1d7676727103aca9785e SHA256 bc531761287156e17476395c42664a15373723f54a6f80f192cda47771ec1225
 DIST lapack-3.3.1.tgz 4945204 RMD160 5e9d90122110045e07351f3ab30dc4e2b43d52db SHA1 3ce437e05f0e9a3c8148ec41922f6efeef0ebdac SHA256 56821ab51c29369a34e5085728f92c549a9aa926f26acf7eeac87b61eed329e4
 EBUILD atlas-3.8.3.ebuild 6019 RMD160 10c7b3937ec41c2c182f1faecbcf7c2e8901befe SHA1 15ebfd302a3764880fc599a7d1cdc59a214e3a27 SHA256 cc3139e44d2da073767df95280be90413fe39f5e02e0ce5243ff2267891d3e16
-EBUILD atlas-3.9.39.ebuild 5979 RMD160 caba82a1f3259acf11cab3380b0efcd04c2755c3 SHA1 df8d5999f89e492fc0462da867b50da69a726394 SHA256 c2e78d76e2498816fa940ff5655a28e240dfc9649b17abdc1be083ba99e87a3b
-MISC ChangeLog 795 RMD160 8d5ba909af2ad30226cc74243d68497841ee82e9 SHA1 81879222c36b0ad11c06fa51eada79606982a4e6 SHA256 7dac35dba3918fd328766170dcab030be67648abe1c32952ffd65a62994254bb
+EBUILD atlas-3.9.40.ebuild 5980 RMD160 07bcffe734a77fa77c919913a4f3fb316a6f03a1 SHA1 1e4bdf4de8efaa303851025845bf7e80074c0d39 SHA256 4af07f31c40b2b4cfc3a84e7c26a727d6e37c3860d84f5b67d278a6bba395531
+MISC ChangeLog 933 RMD160 2191f3230749b57509cbd157b8f979455b247a9d SHA1 84302b19a83b696ca715985901f6ba0bcde11ef2 SHA256 f604d3e15cfbc0fcab74a35f0941e6cf36241b275f256e6d53a9282f895b5c9b
 MISC metadata.xml 726 RMD160 e43f5ea9c594bbe2174f6640bbfdccd8b17d4a68 SHA1 0ab8c05e7925b4716d8c94acd952bf3ab85165cb SHA256 27ef4eee7e645ad923644830d057db45d32342ad250ad903ff10915a9ca068fd

diff --git a/sci-libs/atlas/atlas-3.9.39.ebuild b/sci-libs/atlas/atlas-3.9.40.ebuild
similarity index 99%
rename from sci-libs/atlas/atlas-3.9.39.ebuild
rename to sci-libs/atlas/atlas-3.9.40.ebuild
index 02feaa9..be179e9 100644
--- a/sci-libs/atlas/atlas-3.9.39.ebuild
+++ b/sci-libs/atlas/atlas-3.9.40.ebuild
@@ -183,7 +183,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-bfr-overflow.patch
+	epatch "${FILESDIR}"/3.9.39-bfr-overflow.patch
 }
 
 src_configure() {



^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/atlas/
@ 2011-08-05 18:40 Sebastien Fabbro
  0 siblings, 0 replies; 13+ messages in thread
From: Sebastien Fabbro @ 2011-08-05 18:40 UTC (permalink / raw
  To: gentoo-commits

commit:     934c3473ce0da4075dab229c27cdd70d05f5fa0e
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 18:39:52 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 18:39:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=934c3473

atlas-3.9.x now in sci overlay

---
 sci-libs/atlas/Manifest            |    2 -
 sci-libs/atlas/atlas-3.9.46.ebuild |  266 ------------------------------------
 2 files changed, 0 insertions(+), 268 deletions(-)

diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index 4c28aec..eee6c02 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -1,8 +1,6 @@
 AUX 3.9.39-bfr-overflow.patch 2755 RMD160 4f8204eee5b429e9d3db1c211af80396a575fc87 SHA1 9b59bd8a7bb55e7ed4138731262d17532949ece0 SHA256 19cdab39e50e06de0bdc2a080642388fec3a16c826657621f15fc294268d3438
 DIST atlas3.8.4.tar.bz2 2534071 RMD160 fa2828468459213fcf3f1ae4fd26671ba32f4776 SHA1 ef92bcbc4bec096b34ed7a0d29119d84c973df0c SHA256 0f7720fb16fa4b8b8a192ea791e57569546db6f5f016cf3caaee30a9d94583bf
-DIST atlas3.9.46.tar.bz2 5572227 RMD160 1fbe0f403fc8a35b2b355edabc756c65c19befa2 SHA1 aef8b696bc1bc50b304db953e2f20a653b783317 SHA256 a6667438a04e8a640e5cad75addc7678b19ae7f188c1ae7eb41069f84d43cd1a
 DIST lapack-3.3.1.tgz 4945204 RMD160 5e9d90122110045e07351f3ab30dc4e2b43d52db SHA1 3ce437e05f0e9a3c8148ec41922f6efeef0ebdac SHA256 56821ab51c29369a34e5085728f92c549a9aa926f26acf7eeac87b61eed329e4
 EBUILD atlas-3.8.4.ebuild 7382 RMD160 3d3dca9c817b42e4c8d6ec95f52dc0290340d0eb SHA1 c8ef9142745b320d2f7e2e7da35b25d00ec83d6b SHA256 2516f3ed8a750904fecf0a58ec9e91f63ec98bdb19a17f923908d935fe908720
-EBUILD atlas-3.9.46.ebuild 7335 RMD160 d3a23ef050d15f347c821b2da3f58ad52590ca05 SHA1 ce1413ffb59fe852bafdc7869d9ddf62d2f491fc SHA256 aad7a93c3664722ea4c0de27f0ff868ea0b3f51c5c5e087959531fe06ddd88db
 MISC ChangeLog 1870 RMD160 9cf8d9bb466fef4e2a299fdbc3e0733bf79d9bfa SHA1 a9a8f2f12b153dc3faaef2563d5751306bcab441 SHA256 54a249ef95c2e0f7b987dd17fc9f2038e0baa36551566131d9197c60a9b98cc0
 MISC metadata.xml 726 RMD160 e43f5ea9c594bbe2174f6640bbfdccd8b17d4a68 SHA1 0ab8c05e7925b4716d8c94acd952bf3ab85165cb SHA256 27ef4eee7e645ad923644830d057db45d32342ad250ad903ff10915a9ca068fd

diff --git a/sci-libs/atlas/atlas-3.9.46.ebuild b/sci-libs/atlas/atlas-3.9.46.ebuild
deleted file mode 100644
index 1c988ac..0000000
--- a/sci-libs/atlas/atlas-3.9.46.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils toolchain-funcs versionator alternatives-2
-
-LAPACKP=lapack-3.3.1
-
-DESCRIPTION="Automatically Tuned Linear Algebra Software"
-HOMEPAGE="http://math-atlas.sourceforge.net/"
-SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2
-	fortran? ( lapack? ( http://www.netlib.org/lapack/${LAPACKP}.tgz ) )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 "
-IUSE="fortran doc lapack static-libs threads"
-
-RDEPEND="fortran? ( virtual/fortran )"
-DEPEND="${RDEPEND}
-	!prefix? ( sys-power/cpufrequtils )"
-
-S="${WORKDIR}/ATLAS"
-
-atlas_configure() {
-	local mycc="$(tc-getCC)"
-	# http://sourceforge.net/tracker/?func=detail&aid=3301697&group_id=23725&atid=379483
-	[[ ${mycc} == *gcc* ]] && mycc=gcc
-	local myconf=(
-		"--prefix=${ED}/usr"
-		"--libdir=${ED}/usr/$(get_libdir)"
-		"--incdir=${ED}/usr/include"
-		"--cc=${mycc}"
-		"-C ac ${mycc}"
-		"-D c -DWALL"
-		"-F ac '${CFLAGS}'"
-		"-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
-	)
-
-	# OpenMP shown to decreased performance over POSIX threads
-	# (at least in 3.9.39, see atlas-dev mailing list)
-	if use threads; then
-		myconf+=( "-t -1" "-Si omp 0" )
-	else
-		myconf+=( "-t  0" "-Si omp 0" )
-	fi
-
-	if use amd64 || use ppc64 || use sparc; then
-		if [ ${ABI} = amd64 ] || [ ${ABI} = ppc64 ] || [ ${ABI} = sparc64 ] ; then
-			myconf+=( "-b 64" )
-		elif [ ${ABI} = x86 ] || [ ${ABI} = ppc ] || [ ${ABI} = sparc32 ] ; then
-			myconf+=( "-b 32" )
-		else
-			myconf+=( "-b 64" )
-		fi
-	elif use ppc || use x86; then
-		myconf+=( "-b 32" )
-	elif use ia64; then
-		myconf+=( "-b 64" )
-	else #hppa alpha ...
-		myconf+=( "" )
-	fi
-	if use fortran; then
-		myconf+=(
-			"-C if $(tc-getFC)"
-			"-F if '${FFLAGS}'"
-		)
-		if use lapack; then
-			myconf+=(
-				"-Si latune 1"
-				"--with-netlib-lapack-tarfile=${DISTDIR}/${LAPACKP}.tgz"
-			)
-		else
-			myconf+=( "-Si latune 0" )
-		fi
-	else
-		myconf+=( "-Si latune 0" "--nof77" )
-	fi
-	local confdir="${S}_${1}"; shift
-	myconf+=( $@ )
-	mkdir "${confdir}" && cd "${confdir}"
-	"${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
-}
-
-atlas_compile() {
-	pushd "${S}_${1}" > /dev/null
-	# atlas does its own parallel builds
-	emake -j1 build
-	cd lib
-	emake libclapack.a
-	[[ -e libptcblas.a ]] && emake libptclapack.a
-	popd > /dev/null
-}
-
-# transform a static archive into a shared library and install them
-# atlas_install_libs <mylib.a> [extra link flags]
-atlas_install_libs() {
-	local libname=$(basename ${1%.*})
-	einfo "Installing ${libname}"
-	local soname=${libname}.so.$(get_major_version)
-	shift
-	pushd "${S}_shared"/lib > /dev/null
-	${LINK:-$(tc-getCC)} ${LDFLAGS} -shared -Wl,-soname=${soname} \
-		-Wl,--whole-archive ${libname}.a -Wl,--no-whole-archive \
-		"$@" -o ${soname} || die "Creating ${soname} failed"
-	dolib.so ${soname}
-	ln -s ${soname} ${soname%.*}
-	dosym ${soname} /usr/$(get_libdir)/${soname%.*}
-	popd > /dev/null
-	use static-libs && dolib.a "${S}_static"/lib/${libname}.a
-}
-
-# create and install a pkgconfig file
-# atlas_install_pc <libname> <pkg name> [extra link flags]
-atlas_install_pc() {
-	local libname=${1} ; shift
-	local pcname=${1} ; shift
-	cat <<-EOF > ${pcname}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${pcname}
-		Description: ${PN} ${pcname}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -l${libname} $@
-		Cflags: -I\${includedir}/${PN}
-		${PCREQ}
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${pcname}.pc
-}
-
-pkg_setup() {
-	if [[ -n $(type -P cpufreq-info) ]]; then
-		[[ -z $(cpufreq-info -d) ]] && return
-		local ncpu=$(LANG=C cpufreq-info | grep -c "analyzing CPU")
-		local cpu=0
-		while [[ ${cpu} -lt ${ncpu} ]]; do
-			if ! $(LANG=C cpufreq-info -p -c ${cpu} | grep -q performance); then
-				ewarn "CPU $cpu is not set to performance"
-				ewarn "Run cpufreq-set -r -g performance as root"
-			fi
-			cpu=$(( cpu + 1 ))
-		done
-	else
-		ewarn "Please make sure to disable CPU throttling completely"
-		ewarn "during the compile of ${PN}. Otherwise, all ${PN}"
-		ewarn "generated timings will be completely random and the"
-		ewarn "performance of the resulting libraries will be degraded"
-		ewarn "considerably."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/3.9.39-bfr-overflow.patch
-}
-
-src_configure() {
-	atlas_configure shared "-Fa alg -fPIC"
-	use static-libs && atlas_configure static
-}
-
-src_compile() {
-	atlas_compile shared
-	use static-libs && atlas_compile static
-}
-
-src_test() {
-	cd "${S}_shared"
-	emake -j1 check
-	emake -j1 time
-}
-
-src_install() {
-	cd "${S}_shared/lib"
-	# rename to avoid collision with other packages
-	local l
-	for l in {,c}{blas,lapack}; do
-		if [[ -e lib${l}.a ]]; then
-			mv lib{,atl}${l}.a
-			use static-libs && mv "${S}"_static/lib/lib{,atl}${l}.a
-		fi
-	done
-
-	[[ -e libptcblas.a ]] && PTLIBS="-lpthread"
-
-	# atlas
-	atlas_install_libs libatlas.a -lm ${PTLIBS}
-
-	# cblas
-	atlas_install_libs libatlcblas.a -lm -L. -latlas
-	atlas_install_pc atlcblas atlas-cblas -lm -latlas
-	alternatives_for cblas atlas 0 \
-		/usr/$(get_libdir)/pkgconfig/cblas.pc atlas-cblas.pc \
-		/usr/include/cblas.h atlas/cblas.h
-
-	# cblas threaded
-	if [[ -e libptcblas.a ]]; then
-		atlas_install_libs libptcblas.a -lm -L. -latlas ${PTLIBS}
-		atlas_install_pc ptcblas atlas-cblas-threads -lm -latlas ${PTLIBS}
-		alternatives_for cblas atlas-threads 0 \
-			/usr/$(get_libdir)/pkgconfig/cblas.pc atlas-cblas-threads.pc \
-			/usr/include/cblas.h atlas/cblas.h
-	fi
-
-	if use lapack; then
-		PCREQ="Requires: cblas"
-		# clapack
-		atlas_install_libs libatlclapack.a -lm -L. -latlas -latlcblas
-		atlas_install_pc atlclapack atlas-clapack -lm -latlas
-
-		# clapack threaded
-		if [[ -e libptclapack.a ]]; then
-			atlas_install_libs libptclapack.a -lm -L. -latlas -lptcblas ${PTLIBS}
-			atlas_install_pc ptclapack atlas-clapack-threads -lm -latlas ${PTLIBS}
-		fi
-	fi
-
-	if use fortran; then
-		LINK=$(tc-getF77) PCREQ=
-		# blas
-		atlas_install_libs libf77blas.a -lm -L. -latlas
-		atlas_install_pc f77blas atlas-blas -lm -latlas
-		alternatives_for blas atlas 0 \
-			/usr/$(get_libdir)/pkgconfig/blas.pc atlas-blas.pc
-
-		# blas threaded
-		if [[ -e libptf77blas.a ]]; then
-			atlas_install_libs libptf77blas.a -lm -L. -latlas ${PTLIBS}
-			atlas_install_pc ptf77blas atlas-blas-threads -lm -latlas ${PTLIBS}
-			alternatives_for blas atlas-threads 0 \
-				/usr/$(get_libdir)/pkgconfig/blas.pc atlas-blas-threads.pc
-		fi
-
-		if use lapack; then
-			PCREQ="Requires: blas cblas"
-			# lapack
-			atlas_install_libs libatllapack.a \
-				-lm -L. -latlas -latlcblas -lf77blas
-			atlas_install_pc atllapack atlas-lapack -lm -latlas
-			alternatives_for lapack atlas 0 \
-				/usr/$(get_libdir)/pkgconfig/lapack.pc atlas-lapack.pc
-			# lapack threaded
-			if [[ -e libptlapack.a ]]; then
-				atlas_install_libs libptlapack.a \
-					-lm -L. -latlas -lptcblas -lptf77blas ${PTLIBS}
-				atlas_install_pc ptlapack atlas-lapack-threads \
-					-lm -latlas ${PTLIBS}
-				alternatives_for lapack atlas-threads 0 \
-					/usr/$(get_libdir)/pkgconfig/lapack.pc atlas-lapack-threads.pc
-			fi
-		fi
-	fi
-
-	cd "${S}"
-	insinto /usr/include/${PN}
-	doins include/*.h
-
-	cd "${S}/doc"
-	dodoc INDEX.txt AtlasCredits.txt ChangeLog
-	use doc && dodoc atlas*pdf cblas.pdf cblasqref.pdf
-	use doc && use fortran && dodoc f77blas*pdf
-	use doc && use fortran && use lapack && dodoc lapack*pdf
-}



^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/atlas/
@ 2011-07-25 16:54 Sebastien Fabbro
  0 siblings, 0 replies; 13+ messages in thread
From: Sebastien Fabbro @ 2011-07-25 16:54 UTC (permalink / raw
  To: gentoo-commits

commit:     7e609f5725b2f9e4e34e73cbba648362e83dd703
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 16:54:11 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 16:54:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=7e609f57

bump + removed die on cpu check

---
 sci-libs/atlas/ChangeLog                           |    6 ++++++
 sci-libs/atlas/Manifest                            |    8 ++++----
 sci-libs/atlas/atlas-3.8.4.ebuild                  |    1 -
 .../{atlas-3.9.41.ebuild => atlas-3.9.46.ebuild}   |    1 -
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
index 00e4d80..e17de12 100644
--- a/sci-libs/atlas/ChangeLog
+++ b/sci-libs/atlas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*atlas-3.9.46 (25 Jul 2011)
+
+  25 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org> -atlas-3.9.41.ebuild,
+  +atlas-3.9.46.ebuild:
+  Version bump. Removed die for cpufreq (bug #375193).
+
 *atlas-3.8.4 (23 May 2011)
 
   23 May 2011; Sébastien Fabbro <bicatali@gentoo.org> -atlas-3.8.3.ebuild,

diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index c492fff..4c28aec 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -1,8 +1,8 @@
 AUX 3.9.39-bfr-overflow.patch 2755 RMD160 4f8204eee5b429e9d3db1c211af80396a575fc87 SHA1 9b59bd8a7bb55e7ed4138731262d17532949ece0 SHA256 19cdab39e50e06de0bdc2a080642388fec3a16c826657621f15fc294268d3438
 DIST atlas3.8.4.tar.bz2 2534071 RMD160 fa2828468459213fcf3f1ae4fd26671ba32f4776 SHA1 ef92bcbc4bec096b34ed7a0d29119d84c973df0c SHA256 0f7720fb16fa4b8b8a192ea791e57569546db6f5f016cf3caaee30a9d94583bf
-DIST atlas3.9.41.tar.bz2 5498475 RMD160 d068b3cbc330aa2ad5f578dc2ae2d0cf86844155 SHA1 35424fda470feb78a29081c991eefa1276a5f52b SHA256 3fc1a4200ee953873747a7cb90b13532d1fb3f81a4cbb91c0e0fabb3eddb3bfc
+DIST atlas3.9.46.tar.bz2 5572227 RMD160 1fbe0f403fc8a35b2b355edabc756c65c19befa2 SHA1 aef8b696bc1bc50b304db953e2f20a653b783317 SHA256 a6667438a04e8a640e5cad75addc7678b19ae7f188c1ae7eb41069f84d43cd1a
 DIST lapack-3.3.1.tgz 4945204 RMD160 5e9d90122110045e07351f3ab30dc4e2b43d52db SHA1 3ce437e05f0e9a3c8148ec41922f6efeef0ebdac SHA256 56821ab51c29369a34e5085728f92c549a9aa926f26acf7eeac87b61eed329e4
-EBUILD atlas-3.8.4.ebuild 7431 RMD160 383e358040c54435ae80f0dfe749e398ba86bc5e SHA1 d7d13b5a511de22e645f0f4c6cb3354368123001 SHA256 9908b00fe60efe90eb9d7432b12543ff1a150b23fba8c10aaf31c51a375cee87
-EBUILD atlas-3.9.41.ebuild 7384 RMD160 58c03d677d13fba19893267ea007108b7a50d60c SHA1 3c519ff51d75cf4d401cb6ef003ab97bb14f7666 SHA256 ece0d09608c78c7b6cc51dc4f0c11ed21b96ed745c587080ad829e96879bceaa
-MISC ChangeLog 1684 RMD160 2840ad1a3e4eb9c47b39562e979dbc1319db132e SHA1 427d6b649b5fa8129f5419c47f702b20136633f3 SHA256 afa3f2debcfca046fcaf1ef5de84f13544370c960249003b9bac043879f9348b
+EBUILD atlas-3.8.4.ebuild 7382 RMD160 3d3dca9c817b42e4c8d6ec95f52dc0290340d0eb SHA1 c8ef9142745b320d2f7e2e7da35b25d00ec83d6b SHA256 2516f3ed8a750904fecf0a58ec9e91f63ec98bdb19a17f923908d935fe908720
+EBUILD atlas-3.9.46.ebuild 7335 RMD160 d3a23ef050d15f347c821b2da3f58ad52590ca05 SHA1 ce1413ffb59fe852bafdc7869d9ddf62d2f491fc SHA256 aad7a93c3664722ea4c0de27f0ff868ea0b3f51c5c5e087959531fe06ddd88db
+MISC ChangeLog 1870 RMD160 9cf8d9bb466fef4e2a299fdbc3e0733bf79d9bfa SHA1 a9a8f2f12b153dc3faaef2563d5751306bcab441 SHA256 54a249ef95c2e0f7b987dd17fc9f2038e0baa36551566131d9197c60a9b98cc0
 MISC metadata.xml 726 RMD160 e43f5ea9c594bbe2174f6640bbfdccd8b17d4a68 SHA1 0ab8c05e7925b4716d8c94acd952bf3ab85165cb SHA256 27ef4eee7e645ad923644830d057db45d32342ad250ad903ff10915a9ca068fd

diff --git a/sci-libs/atlas/atlas-3.8.4.ebuild b/sci-libs/atlas/atlas-3.8.4.ebuild
index 76e8fdd..8a54ce9 100644
--- a/sci-libs/atlas/atlas-3.8.4.ebuild
+++ b/sci-libs/atlas/atlas-3.8.4.ebuild
@@ -163,7 +163,6 @@ pkg_setup() {
 			if ! $(LANG=C cpufreq-info -p -c ${cpu} | grep -q performance); then
 				ewarn "CPU $cpu is not set to performance"
 				ewarn "Run cpufreq-set -r -g performance as root"
-				die "${PN} needs all cpu set to performance"
 			fi
 			cpu=$(( cpu + 1 ))
 		done

diff --git a/sci-libs/atlas/atlas-3.9.41.ebuild b/sci-libs/atlas/atlas-3.9.46.ebuild
similarity index 99%
rename from sci-libs/atlas/atlas-3.9.41.ebuild
rename to sci-libs/atlas/atlas-3.9.46.ebuild
index 78104f3..1c988ac 100644
--- a/sci-libs/atlas/atlas-3.9.41.ebuild
+++ b/sci-libs/atlas/atlas-3.9.46.ebuild
@@ -141,7 +141,6 @@ pkg_setup() {
 			if ! $(LANG=C cpufreq-info -p -c ${cpu} | grep -q performance); then
 				ewarn "CPU $cpu is not set to performance"
 				ewarn "Run cpufreq-set -r -g performance as root"
-				die "${PN} needs all cpu set to performance"
 			fi
 			cpu=$(( cpu + 1 ))
 		done



^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/atlas/
@ 2011-05-23 18:44 Sebastien Fabbro
  0 siblings, 0 replies; 13+ messages in thread
From: Sebastien Fabbro @ 2011-05-23 18:44 UTC (permalink / raw
  To: gentoo-commits

commit:     4f752d4fe2bdd34a10f2ed85a8dbcc3dc6b3ad43
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 15:54:22 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon May 23 15:54:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=4f752d4f

gcc temporary hack to avoid undefined symbols

---
 sci-libs/atlas/ChangeLog           |    3 +++
 sci-libs/atlas/atlas-3.9.41.ebuild |    7 +++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
index c1735c9..685e0d5 100644
--- a/sci-libs/atlas/ChangeLog
+++ b/sci-libs/atlas/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  23 May 2011; Sébastien Fabbro <bicatali@gentoo.org> atlas-3.9.41.ebuild:
+  Forces gcc whenever a version of gcc is used, avoiding upstream bug
+
 *atlas-3.9.41 (17 May 2011)
 
   17 May 2011; Sébastien Fabbro <bicatali@gentoo.org> -atlas-3.9.40-r1.ebuild,

diff --git a/sci-libs/atlas/atlas-3.9.41.ebuild b/sci-libs/atlas/atlas-3.9.41.ebuild
index d74ecb2..78104f3 100644
--- a/sci-libs/atlas/atlas-3.9.41.ebuild
+++ b/sci-libs/atlas/atlas-3.9.41.ebuild
@@ -24,12 +24,15 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/ATLAS"
 
 atlas_configure() {
+	local mycc="$(tc-getCC)"
+	# http://sourceforge.net/tracker/?func=detail&aid=3301697&group_id=23725&atid=379483
+	[[ ${mycc} == *gcc* ]] && mycc=gcc
 	local myconf=(
 		"--prefix=${ED}/usr"
 		"--libdir=${ED}/usr/$(get_libdir)"
 		"--incdir=${ED}/usr/include"
-		"--cc=$(tc-getCC)"
-		"-C ac $(tc-getCC)"
+		"--cc=${mycc}"
+		"-C ac ${mycc}"
 		"-D c -DWALL"
 		"-F ac '${CFLAGS}'"
 		"-Ss pmake '\$(MAKE) ${MAKEOPTS}'"



^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/atlas/
@ 2011-05-23 18:44 Sebastien Fabbro
  0 siblings, 0 replies; 13+ messages in thread
From: Sebastien Fabbro @ 2011-05-23 18:44 UTC (permalink / raw
  To: gentoo-commits

commit:     53fb259d4e6bee0b6caa430b1b696116a9c92c7a
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 17:56:13 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon May 23 17:56:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=53fb259d

bumped stable atlas

---
 sci-libs/atlas/ChangeLog          |    6 +
 sci-libs/atlas/Manifest           |    9 +-
 sci-libs/atlas/atlas-3.8.3.ebuild |  224 -----------------------------
 sci-libs/atlas/atlas-3.8.4.ebuild |  282 +++++++++++++++++++++++++++++++++++++
 4 files changed, 292 insertions(+), 229 deletions(-)

diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
index 685e0d5..00e4d80 100644
--- a/sci-libs/atlas/ChangeLog
+++ b/sci-libs/atlas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*atlas-3.8.4 (23 May 2011)
+
+  23 May 2011; Sébastien Fabbro <bicatali@gentoo.org> -atlas-3.8.3.ebuild,
+  +atlas-3.8.4.ebuild:
+  Version bump of the stable branch
+
   23 May 2011; Sébastien Fabbro <bicatali@gentoo.org> atlas-3.9.41.ebuild:
   Forces gcc whenever a version of gcc is used, avoiding upstream bug
 

diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index b99b87c..c492fff 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -1,9 +1,8 @@
 AUX 3.9.39-bfr-overflow.patch 2755 RMD160 4f8204eee5b429e9d3db1c211af80396a575fc87 SHA1 9b59bd8a7bb55e7ed4138731262d17532949ece0 SHA256 19cdab39e50e06de0bdc2a080642388fec3a16c826657621f15fc294268d3438
-DIST atlas3.8.3.tar.bz2 2527756 RMD160 0425e630d9d0c5b7aae81427a41b7eaa18447e90 SHA1 c7546210df4796457d9e96a00444adc4c0f2e77f SHA256 e537168f2022db98b9029c8064815b5581620c12d782016138b1bf0bbb01f473
+DIST atlas3.8.4.tar.bz2 2534071 RMD160 fa2828468459213fcf3f1ae4fd26671ba32f4776 SHA1 ef92bcbc4bec096b34ed7a0d29119d84c973df0c SHA256 0f7720fb16fa4b8b8a192ea791e57569546db6f5f016cf3caaee30a9d94583bf
 DIST atlas3.9.41.tar.bz2 5498475 RMD160 d068b3cbc330aa2ad5f578dc2ae2d0cf86844155 SHA1 35424fda470feb78a29081c991eefa1276a5f52b SHA256 3fc1a4200ee953873747a7cb90b13532d1fb3f81a4cbb91c0e0fabb3eddb3bfc
-DIST lapack-3.3.0.tgz 6064824 RMD160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e SHA1 4f0b103da52110e7f60d1d7676727103aca9785e SHA256 bc531761287156e17476395c42664a15373723f54a6f80f192cda47771ec1225
 DIST lapack-3.3.1.tgz 4945204 RMD160 5e9d90122110045e07351f3ab30dc4e2b43d52db SHA1 3ce437e05f0e9a3c8148ec41922f6efeef0ebdac SHA256 56821ab51c29369a34e5085728f92c549a9aa926f26acf7eeac87b61eed329e4
-EBUILD atlas-3.8.3.ebuild 6019 RMD160 10c7b3937ec41c2c182f1faecbcf7c2e8901befe SHA1 15ebfd302a3764880fc599a7d1cdc59a214e3a27 SHA256 cc3139e44d2da073767df95280be90413fe39f5e02e0ce5243ff2267891d3e16
-EBUILD atlas-3.9.41.ebuild 7244 RMD160 bb812c1afdfb44626215699cdbde5c72576315b2 SHA1 2ddf511f633c64d534136d33782e15bd02e0252a SHA256 c15fe7534a3a7a48cb2f1f8208df074b1e32c3b1ef2beea43af0f355c594da7a
-MISC ChangeLog 1373 RMD160 2545605aee8386c6c6140d2c9424657301a9e52e SHA1 bf2da4db791f09b1d6e2e126e97306a09a29d84b SHA256 a525e0fc450241a5c2da322768776c2c21eb7a7870a3ed801e1e99cdaf88561f
+EBUILD atlas-3.8.4.ebuild 7431 RMD160 383e358040c54435ae80f0dfe749e398ba86bc5e SHA1 d7d13b5a511de22e645f0f4c6cb3354368123001 SHA256 9908b00fe60efe90eb9d7432b12543ff1a150b23fba8c10aaf31c51a375cee87
+EBUILD atlas-3.9.41.ebuild 7384 RMD160 58c03d677d13fba19893267ea007108b7a50d60c SHA1 3c519ff51d75cf4d401cb6ef003ab97bb14f7666 SHA256 ece0d09608c78c7b6cc51dc4f0c11ed21b96ed745c587080ad829e96879bceaa
+MISC ChangeLog 1684 RMD160 2840ad1a3e4eb9c47b39562e979dbc1319db132e SHA1 427d6b649b5fa8129f5419c47f702b20136633f3 SHA256 afa3f2debcfca046fcaf1ef5de84f13544370c960249003b9bac043879f9348b
 MISC metadata.xml 726 RMD160 e43f5ea9c594bbe2174f6640bbfdccd8b17d4a68 SHA1 0ab8c05e7925b4716d8c94acd952bf3ab85165cb SHA256 27ef4eee7e645ad923644830d057db45d32342ad250ad903ff10915a9ca068fd

diff --git a/sci-libs/atlas/atlas-3.8.3.ebuild b/sci-libs/atlas/atlas-3.8.3.ebuild
deleted file mode 100644
index 047a6d5..0000000
--- a/sci-libs/atlas/atlas-3.8.3.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-inherit eutils toolchain-funcs multilib alternatives-2
-
-LAPACKP=lapack-3.3.0
-
-DESCRIPTION="Automatically Tuned Linear Algebra Software"
-HOMEPAGE="http://math-atlas.sourceforge.net/"
-SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2
-	fortran? ( lapack? ( http://www.netlib.org/lapack/${LAPACKP}.tgz ) )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fortran doc lapack static-libs xblas"
-
-RDEPEND="lapack? ( xblas? ( sci-libs/xblas ) )"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/ATLAS"
-
-pkg_setup() {
-	if [[ -n $(type -P cpufreq-info) ]]; then
-		[[ -z $(cpufreq-info -d) ]] && return
-		local ncpu=$(LANG=C cpufreq-info | grep -c "analyzing CPU")
-		local cpu=0
-		while [[ ${cpu} -lt ${ncpu} ]]; do
-			if "$(LANG=C cpufreq-info -p -c ${cpu} | grep -q performance)"; then
-				ewarn "CPU $cpu is not set to performance"
-				ewarn "Run sudo cpufreq-set -g performance -c <CPU #> for all CPUs"
-				die "${PN} needs all cpu set to performance"
-			fi
-			cpu=$(( cpu + 1 ))
-		done
-	else
-		ewarn "Please make sure to disable CPU throttling completely"
-		ewarn "during the compile of ${PN}. Otherwise, all ${PN}"
-		ewarn "generated timings will be completely random and the"
-		ewarn "performance of the resulting libraries will be degraded"
-		ewarn "considerably."
-	fi
-}
-
-lapack_compile() {
-	cd "${WORKDIR}/${LAPACKP}"
-	local timer=INT_CPU_TIME
-	case $(tc-getFC) in
-		*gfortran|*g77) timer=INT_ETIME ;;
-		*ifort) timer=EXT_ETIME ;;
-	esac
-	cat > make.inc <<-EOF
-		FORTRAN = $(tc-getFC)
-		OPTS = ${FFLAGS}
-		NOOPT = -O0
-		LOADER = $(tc-getFC)
-		LOADEROPTS = ${LDFLAGS}
-		ARCH = $(tc-getAR)
-		ARCHFLAGS = cr
-		RANLIB = $(tc-getRANLIB)
-		TIMER = ${timer}
-		$(use xblas && echo "USEXBLAS = Yes")
-	EOF
-	if use static-libs; then
-		emake \
-			LAPACKLIB=liblapack_nonpic.a \
-			lapacklib || die "lapack static compilation failed"
-		emake clean
-	fi
-	emake \
-		LAPACKLIB=liblapack_pic.a \
-		OPTS="${FFLAGS} -fPIC" \
-		NOOPT="-O0 -fPIC" \
-		lapacklib || die "lapack pic compilation failed"
-}
-
-src_configure() {
-	# we need a pic static lapack lib before configuring
-	use lapack && lapack_compile
-	local myconf=(
-		"--prefix=${ED}/usr"
-		"--libdir=${ED}/usr/$(get_libdir)"
-		"--incdir=${ED}/usr/include"
-		"--cc=$(tc-getCC)"
-		"-C ac $(tc-getCC)"
-		"-D c -DWALL"
-		"-F ac '${CFLAGS}'"
-		"-Si cputhrchk 0"
-		"-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
-	)
-
-	if use amd64 || use ppc64 || use sparc; then
-		if [ ${ABI} = amd64 ] || [ ${ABI} = ppc64 ] || [ ${ABI} = sparc64 ] ; then
-			myconf+=( "-b 64" )
-		elif [ ${ABI} = x86 ] || [ ${ABI} = ppc ] || [ ${ABI} = sparc32 ] ; then
-			myconf+=( "-b 32" )
-		else
-			myconf+=( "-b 64" )
-		fi
-	elif use ppc || use x86; then
-		myconf+=( "-b 32" )
-	elif use ia64; then
-		myconf+=( "-b 64" )
-	else #hppa alpha ...
-		myconf+=( "" )
-	fi
-	if use fortran; then
-		myconf+=(
-			"-C if $(tc-getFC)"
-			"-F if '${FFLAGS}'"
-		)
-	else
-		myconf+=( "--nof77"	)
-	fi
-
-	LAPACKLIB="${WORKDIR}/${LAPACKP}/liblapack"
-	if use static-libs; then
-		mkdir "${S}_build_static" && cd "${S}_build_static"
-		"${S}"/configure \
-			${myconf[@]} \
-			$(use lapack && echo "--with-netlib-lapack=${LAPACKLIB}_nonpic.a") \
-			|| die "configure static failed"
-	fi
-
-	mkdir "${S}_build_shared" && cd "${S}_build_shared"
-	myconf+=( "-Fa alg -fPIC" )
-	"${S}"/configure \
-		${myconf[@]} \
-		$(use lapack && echo "--with-netlib-lapack=${LAPACKLIB}_pic.a") \
-		|| die "configure shared failed"
-}
-
-src_compile() {
-	# atlas does its own parallel builds
-	if use static-libs; then
-		cd "${S}_build_static"
-		emake -j1 build || die "emake static failed"
-	fi
-	cd "${S}_build_shared"
-	emake -j1 build || die "emake static with PIC failed"
-	cd lib
-	local alibs="shared cshared"
-	[[ -e libptcblas.a ]] && alibs="${alibs} ptshared ptcshared"
-	emake ${alibs} || die "emake shared libs failed"
-}
-
-src_test() {
-	cd "${S}_build_shared"
-	emake -j1 check || die "emake check failed"
-	emake -j1 time || die "emake time failed"
-}
-
-# atlas_install <blas|cblas|lapack> <lib>
-atlas_install() {
-	local iname=${1} ilib=${2}
-	if [[ ${iname} == ${ilib} ]]; then
-		# rename to avoid conflict with linked configurations
-		mv "${ED}"/usr/$(get_libdir)/lib{,a}${ilib}.so
-		use static-libs && "${ED}"/usr/$(get_libdir)/lib{,a}${ilib}.a
-		ilib=a${ilib}
-	fi
-	local prof=${PN}-${iname} ptlibs=
-	if [[ ${ilib:0:2} == pt ]]; then
-		prof=${prof}-threads
-		ptlibs="-lthreads"
-	fi
-	cat <<-EOF > ${prof}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include
-		Name: ${prof}
-		Description: ${DESCRIPTION} ${iname} implementation
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -latlas -l${ilib} ${ptlibs}
-		Private: -lm
-		Cflags: -I\${includedir}/${PN}
-		$([[ ${1} == lapack ]] && echo "Requires: blas")
-	EOF
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${prof}.pc || die
-	if [[ ${iname} == cblas ]]; then
-		alternatives_for ${iname} ${prof} 0 \
-			"/usr/$(get_libdir)/pkgconfig/${iname}.pc" "${prof}.pc" \
-			"/usr/include/cblas.h" "${PN}/cblas.h"
-	else
-		alternatives_for ${iname} ${prof} 0 \
-			"/usr/$(get_libdir)/pkgconfig/${iname}.pc" "${prof}.pc"
-	fi
-}
-
-src_install() {
-	# do a loop to make sure we install the same in shared/static
-	local l
-	for l in "${S}_build_shared"/lib/lib*.so; do
-		dolib.so "${l}" || die
-		if use static-libs; then
-			dolib.a "${l/_shared/_static}".a || die
-		fi
-	done
-	atlas_install cblas cblas
-	if use fortran; then
-		atlas_install blas f77blas
-		use lapack && atlas_install lapack lapack
-	fi
-	if [[ -e "${S}_build_shared"/lib/libptcblas.so ]]; then
-		atlas_install cblas ptcblas
-		use fortran && atlas_install blas ptf77blas
-	fi
-	insinto /usr/include/${PN}
-	doins include/*.h || die
-	#dosym atlas/clapack.h /usr/include/clapack.h
-
-	cd doc
-	dodoc INDEX.txt AtlasCredits.txt ChangeLog
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins atlas*pdf cblas.pdf cblasqref.pdf || die "doins docs failed"
-		use fortran && doins f77blas*pdf
-		use fortran && doins lapack*pdf
-	fi
-}

diff --git a/sci-libs/atlas/atlas-3.8.4.ebuild b/sci-libs/atlas/atlas-3.8.4.ebuild
new file mode 100644
index 0000000..76e8fdd
--- /dev/null
+++ b/sci-libs/atlas/atlas-3.8.4.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit eutils toolchain-funcs versionator alternatives-2
+
+LAPACKP=lapack-3.3.1
+
+DESCRIPTION="Automatically Tuned Linear Algebra Software"
+HOMEPAGE="http://math-atlas.sourceforge.net/"
+SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2
+	fortran? ( lapack? ( http://www.netlib.org/lapack/${LAPACKP}.tgz ) )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 "
+IUSE="fortran doc lapack static-libs threads"
+
+RDEPEND="fortran? ( virtual/fortran )"
+DEPEND="${RDEPEND}
+	!prefix? ( sys-power/cpufrequtils )"
+
+S="${WORKDIR}/ATLAS"
+
+lapack_compile() {
+	cd "${WORKDIR}/${LAPACKP}"
+	local timer=INT_CPU_TIME
+	case $(tc-getFC) in
+		*gfortran|*g77) timer=INT_ETIME ;;
+		*ifort) timer=EXT_ETIME ;;
+	esac
+	cat > make.inc <<-EOF
+		FORTRAN = $(tc-getFC)
+		OPTS = ${FFLAGS}
+		NOOPT = -O0
+		LOADER = $(tc-getFC)
+		LOADEROPTS = ${LDFLAGS}
+		ARCH = $(tc-getAR)
+		ARCHFLAGS = cr
+		RANLIB = $(tc-getRANLIB)
+		TIMER = ${timer}
+	EOF
+	if use static-libs; then
+		emake \
+			LAPACKLIB=liblapack_nonpic.a \
+			lapacklib || die "lapack static compilation failed"
+		emake clean
+	fi
+	emake \
+		LAPACKLIB=liblapack_pic.a \
+		OPTS="${FFLAGS} -fPIC" \
+		NOOPT="-O0 -fPIC" \
+		lapacklib || die "lapack pic compilation failed"
+}
+
+atlas_configure() {
+	local mycc="$(tc-getCC)"
+	# http://sourceforge.net/tracker/?func=detail&aid=3301697&group_id=23725&atid=379483
+	[[ ${mycc} == *gcc* ]] && mycc=gcc
+	local myconf=(
+		"--prefix=${ED}/usr"
+		"--libdir=${ED}/usr/$(get_libdir)"
+		"--incdir=${ED}/usr/include"
+		"--cc=${mycc}"
+		"-C ac ${mycc}"
+		"-D c -DWALL"
+		"-F ac '${CFLAGS}'"
+		"-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
+	)
+
+	if use threads; then
+		myconf+=( "-t -1" )
+	else
+		myconf+=( "-t  0" )
+	fi
+
+	if use amd64 || use ppc64 || use sparc; then
+		if [ ${ABI} = amd64 ] || [ ${ABI} = ppc64 ] || [ ${ABI} = sparc64 ] ; then
+			myconf+=( "-b 64" )
+		elif [ ${ABI} = x86 ] || [ ${ABI} = ppc ] || [ ${ABI} = sparc32 ] ; then
+			myconf+=( "-b 32" )
+		else
+			myconf+=( "-b 64" )
+		fi
+	elif use ppc || use x86; then
+		myconf+=( "-b 32" )
+	elif use ia64; then
+		myconf+=( "-b 64" )
+	else #hppa alpha ...
+		myconf+=( "" )
+	fi
+	if use fortran; then
+		myconf+=(
+			"-Si nof77 0"
+			"-C if $(tc-getFC)"
+			"-F if '${FFLAGS}'"
+		)
+		use lapack && myconf+=( "--with-netlib-lapack=${LAPACKLIB}" )
+	else
+		myconf+=( "-Si nof77 1" )
+	fi
+	local confdir="${S}_${1}"; shift
+	myconf+=( $@ )
+	mkdir "${confdir}" && cd "${confdir}"
+	"${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
+}
+
+atlas_compile() {
+	pushd "${S}_${1}" > /dev/null
+	# atlas does its own parallel builds
+	emake -j1 build
+	cd lib
+	emake libclapack.a
+	popd > /dev/null
+}
+
+# transform a static archive into a shared library and install them
+# atlas_install_libs <mylib.a> [extra link flags]
+atlas_install_libs() {
+	local libname=$(basename ${1%.*})
+	einfo "Installing ${libname}"
+	local soname=${libname}.so.$(get_major_version)
+	shift
+	pushd "${S}_shared"/lib > /dev/null
+	${LINK:-$(tc-getCC)} ${LDFLAGS} -shared -Wl,-soname=${soname} \
+		-Wl,--whole-archive ${libname}.a -Wl,--no-whole-archive \
+		"$@" -o ${soname} || die "Creating ${soname} failed"
+	dolib.so ${soname}
+	ln -s ${soname} ${soname%.*}
+	dosym ${soname} /usr/$(get_libdir)/${soname%.*}
+	popd > /dev/null
+	use static-libs && dolib.a "${S}_static"/lib/${libname}.a
+}
+
+# create and install a pkgconfig file
+# atlas_install_pc <libname> <pkg name> [extra link flags]
+atlas_install_pc() {
+	local libname=${1} ; shift
+	local pcname=${1} ; shift
+	cat <<-EOF > ${pcname}.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include
+		Name: ${pcname}
+		Description: ${PN} ${pcname}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -l${libname} $@
+		Cflags: -I\${includedir}/${PN}
+		${PCREQ}
+	EOF
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${pcname}.pc
+}
+
+pkg_setup() {
+	if [[ -n $(type -P cpufreq-info) ]]; then
+		[[ -z $(cpufreq-info -d) ]] && return
+		local ncpu=$(LANG=C cpufreq-info | grep -c "analyzing CPU")
+		local cpu=0
+		while [[ ${cpu} -lt ${ncpu} ]]; do
+			if ! $(LANG=C cpufreq-info -p -c ${cpu} | grep -q performance); then
+				ewarn "CPU $cpu is not set to performance"
+				ewarn "Run cpufreq-set -r -g performance as root"
+				die "${PN} needs all cpu set to performance"
+			fi
+			cpu=$(( cpu + 1 ))
+		done
+	else
+		ewarn "Please make sure to disable CPU throttling completely"
+		ewarn "during the compile of ${PN}. Otherwise, all ${PN}"
+		ewarn "generated timings will be completely random and the"
+		ewarn "performance of the resulting libraries will be degraded"
+		ewarn "considerably."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/3.9.39-bfr-overflow.patch
+}
+
+src_configure() {
+	if use fortran && use lapack; then
+		lapack_compile
+		LAPACKLIB="${WORKDIR}/${LAPACKP}/liblapack_pic.a"
+	fi
+	atlas_configure shared "-Fa alg -fPIC"
+	if use static-libs; then
+		use fortran && use lapack && \
+			LAPACKLIB="${WORKDIR}/${LAPACKP}/liblapack_nonpic.a"
+		atlas_configure static
+	fi
+}
+
+src_compile() {
+	atlas_compile shared
+	use static-libs && atlas_compile static
+}
+
+src_test() {
+	cd "${S}_shared"
+	emake -j1 check
+	emake -j1 time
+}
+
+src_install() {
+	cd "${S}_shared/lib"
+	# rename to avoid collision with other packages
+	local l
+	for l in {,c}{blas,lapack}; do
+		if [[ -e lib${l}.a ]]; then
+			mv lib{,atl}${l}.a
+			use static-libs && mv "${S}"_static/lib/lib{,atl}${l}.a
+		fi
+	done
+
+	[[ -e libptcblas.a ]] && PTLIBS="-lpthread"
+
+	# atlas
+	atlas_install_libs libatlas.a -lm ${PTLIBS}
+
+	# cblas
+	atlas_install_libs libatlcblas.a -lm -L. -latlas
+	atlas_install_pc atlcblas atlas-cblas -lm -latlas
+	alternatives_for cblas atlas 0 \
+		/usr/$(get_libdir)/pkgconfig/cblas.pc atlas-cblas.pc \
+		/usr/include/cblas.h atlas/cblas.h
+
+	# cblas threaded
+	if [[ -e libptcblas.a ]]; then
+		atlas_install_libs libptcblas.a -lm -L. -latlas ${PTLIBS}
+		atlas_install_pc ptcblas atlas-cblas-threads -lm -latlas ${PTLIBS}
+		alternatives_for cblas atlas-threads 0 \
+			/usr/$(get_libdir)/pkgconfig/cblas.pc atlas-cblas-threads.pc \
+			/usr/include/cblas.h atlas/cblas.h
+	fi
+
+	if use lapack; then
+		PCREQ="Requires: cblas"
+		# clapack
+		atlas_install_libs libatlclapack.a -lm -L. -latlas -latlcblas
+		atlas_install_pc atlclapack atlas-clapack -lm -latlas
+	fi
+
+	if use fortran; then
+		LINK=$(tc-getF77) PCREQ=
+		# blas
+		atlas_install_libs libf77blas.a -lm -L. -latlas
+		atlas_install_pc f77blas atlas-blas -lm -latlas
+		alternatives_for blas atlas 0 \
+			/usr/$(get_libdir)/pkgconfig/blas.pc atlas-blas.pc
+
+		# blas threaded
+		if [[ -e libptf77blas.a ]]; then
+			atlas_install_libs libptf77blas.a -lm -L. -latlas ${PTLIBS}
+			atlas_install_pc ptf77blas atlas-blas-threads -lm -latlas ${PTLIBS}
+			alternatives_for blas atlas-threads 0 \
+				/usr/$(get_libdir)/pkgconfig/blas.pc atlas-blas-threads.pc
+		fi
+
+		if use lapack; then
+			PCREQ="Requires: blas cblas"
+			# lapack
+			atlas_install_libs libatllapack.a \
+				-lm -L. -latlas -latlcblas -lf77blas
+			atlas_install_pc atllapack atlas-lapack -lm -latlas
+			alternatives_for lapack atlas 0 \
+				/usr/$(get_libdir)/pkgconfig/lapack.pc atlas-lapack.pc
+		fi
+	fi
+
+	cd "${S}"
+	insinto /usr/include/${PN}
+	doins include/*.h
+
+	cd "${S}/doc"
+	dodoc INDEX.txt AtlasCredits.txt ChangeLog
+	use doc && dodoc atlas*pdf cblas.pdf cblasqref.pdf
+	use doc && use fortran && dodoc f77blas*pdf
+	use doc && use fortran && use lapack && dodoc lapack*pdf
+}



^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/atlas/
@ 2011-05-17 17:16 Sebastien Fabbro
  0 siblings, 0 replies; 13+ messages in thread
From: Sebastien Fabbro @ 2011-05-17 17:16 UTC (permalink / raw
  To: gentoo-commits

commit:     c9efd67dac8ad551c6472ffb111f3b73f1fdc7f0
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 17:06:26 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue May 17 17:06:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=c9efd67d

atlas version bump

---
 sci-libs/atlas/ChangeLog                           |    6 ++++++
 sci-libs/atlas/Manifest                            |    6 +++---
 ...{atlas-3.9.40-r1.ebuild => atlas-3.9.41.ebuild} |   16 ++++++----------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
index 44edf90..c1735c9 100644
--- a/sci-libs/atlas/ChangeLog
+++ b/sci-libs/atlas/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*atlas-3.9.41 (17 May 2011)
+
+  17 May 2011; Sébastien Fabbro <bicatali@gentoo.org> -atlas-3.9.40-r1.ebuild,
+  +atlas-3.9.41.ebuild:
+  Version bump. Removed archdef 0 causing undefined symbols
+
 *atlas-3.9.40-r1 (29 Apr 2011)
 
   29 Apr 2011; Sébastien Fabbro <bicatali@gentoo.org> -atlas-3.9.40.ebuild,

diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index 8806550..b99b87c 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -1,9 +1,9 @@
 AUX 3.9.39-bfr-overflow.patch 2755 RMD160 4f8204eee5b429e9d3db1c211af80396a575fc87 SHA1 9b59bd8a7bb55e7ed4138731262d17532949ece0 SHA256 19cdab39e50e06de0bdc2a080642388fec3a16c826657621f15fc294268d3438
 DIST atlas3.8.3.tar.bz2 2527756 RMD160 0425e630d9d0c5b7aae81427a41b7eaa18447e90 SHA1 c7546210df4796457d9e96a00444adc4c0f2e77f SHA256 e537168f2022db98b9029c8064815b5581620c12d782016138b1bf0bbb01f473
-DIST atlas3.9.40.tar.bz2 5483901 RMD160 8cb7568a287f063c133a7272593706a38ef20648 SHA1 b7463a47bd5ea0a3da497a1bb1c37960d2002a1b SHA256 7cb889d17d20d2224b1c3a811306fe0060de2435b2527a79025396b260ec9fec
+DIST atlas3.9.41.tar.bz2 5498475 RMD160 d068b3cbc330aa2ad5f578dc2ae2d0cf86844155 SHA1 35424fda470feb78a29081c991eefa1276a5f52b SHA256 3fc1a4200ee953873747a7cb90b13532d1fb3f81a4cbb91c0e0fabb3eddb3bfc
 DIST lapack-3.3.0.tgz 6064824 RMD160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e SHA1 4f0b103da52110e7f60d1d7676727103aca9785e SHA256 bc531761287156e17476395c42664a15373723f54a6f80f192cda47771ec1225
 DIST lapack-3.3.1.tgz 4945204 RMD160 5e9d90122110045e07351f3ab30dc4e2b43d52db SHA1 3ce437e05f0e9a3c8148ec41922f6efeef0ebdac SHA256 56821ab51c29369a34e5085728f92c549a9aa926f26acf7eeac87b61eed329e4
 EBUILD atlas-3.8.3.ebuild 6019 RMD160 10c7b3937ec41c2c182f1faecbcf7c2e8901befe SHA1 15ebfd302a3764880fc599a7d1cdc59a214e3a27 SHA256 cc3139e44d2da073767df95280be90413fe39f5e02e0ce5243ff2267891d3e16
-EBUILD atlas-3.9.40-r1.ebuild 7301 RMD160 f0621c5a638c91a65399b5afe2644a4ea4b5e409 SHA1 43c672c9f78942f1846b18df9a8e19b06a40cbde SHA256 a9ade6ae82d343716b94f73cf84fff3a8e91aa72663427e741dd867189acd774
-MISC ChangeLog 1179 RMD160 bd748f26de8ce3a28b374f008f24c24fecab200f SHA1 6ea21403379496bde2477272992dca40facba1c0 SHA256 a404d161ebfce79c60171fe6cfc1016c1d51a90b631b40521e9aab8bf5b51353
+EBUILD atlas-3.9.41.ebuild 7244 RMD160 bb812c1afdfb44626215699cdbde5c72576315b2 SHA1 2ddf511f633c64d534136d33782e15bd02e0252a SHA256 c15fe7534a3a7a48cb2f1f8208df074b1e32c3b1ef2beea43af0f355c594da7a
+MISC ChangeLog 1373 RMD160 2545605aee8386c6c6140d2c9424657301a9e52e SHA1 bf2da4db791f09b1d6e2e126e97306a09a29d84b SHA256 a525e0fc450241a5c2da322768776c2c21eb7a7870a3ed801e1e99cdaf88561f
 MISC metadata.xml 726 RMD160 e43f5ea9c594bbe2174f6640bbfdccd8b17d4a68 SHA1 0ab8c05e7925b4716d8c94acd952bf3ab85165cb SHA256 27ef4eee7e645ad923644830d057db45d32342ad250ad903ff10915a9ca068fd

diff --git a/sci-libs/atlas/atlas-3.9.40-r1.ebuild b/sci-libs/atlas/atlas-3.9.41.ebuild
similarity index 95%
rename from sci-libs/atlas/atlas-3.9.40-r1.ebuild
rename to sci-libs/atlas/atlas-3.9.41.ebuild
index a06bdfe..d74ecb2 100644
--- a/sci-libs/atlas/atlas-3.9.40-r1.ebuild
+++ b/sci-libs/atlas/atlas-3.9.41.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=4
-inherit eutils toolchain-funcs multilib versionator alternatives-2
+inherit eutils toolchain-funcs versionator alternatives-2
 
 LAPACKP=lapack-3.3.1
 
@@ -32,7 +32,6 @@ atlas_configure() {
 		"-C ac $(tc-getCC)"
 		"-D c -DWALL"
 		"-F ac '${CFLAGS}'"
-		"-Si cputhrchk 0"
 		"-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
 	)
 
@@ -73,10 +72,7 @@ atlas_configure() {
 			myconf+=( "-Si latune 0" )
 		fi
 	else
-		myconf+=(
-			"-Si latune 0"
-			"--nof77"
-		)
+		myconf+=( "-Si latune 0" "--nof77" )
 	fi
 	local confdir="${S}_${1}"; shift
 	myconf+=( $@ )
@@ -179,10 +175,10 @@ src_install() {
 	cd "${S}_shared/lib"
 	# rename to avoid collision with other packages
 	local l
-	for l in lib{,c}blas.a lib{,c}lapack.a ; do
-		if [[ -e ${l} ]]; then
-			mv ${l} ${l/lib/libatl}
-			use static-libs && mv "${S}"_static/lib/{${l},${l/lib/libatl}}
+	for l in {,c}{blas,lapack}; do
+		if [[ -e lib${l}.a ]]; then
+			mv lib{,atl}${l}.a
+			use static-libs && mv "${S}"_static/lib/lib{,atl}${l}.a
 		fi
 	done
 



^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/atlas/
@ 2011-04-29 17:28 Sebastien Fabbro
  0 siblings, 0 replies; 13+ messages in thread
From: Sebastien Fabbro @ 2011-04-29 17:28 UTC (permalink / raw
  To: gentoo-commits

commit:     6be2e51b0f56b23d29915960592b80a47bcd3fa3
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 17:28:05 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 17:28:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=6be2e51b

cleaned pkg-config files

---
 sci-libs/atlas/Manifest               |    2 +-
 sci-libs/atlas/atlas-3.9.40-r1.ebuild |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index bdd2049..33449f5 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -4,6 +4,6 @@ DIST atlas3.9.40.tar.bz2 5483901 RMD160 8cb7568a287f063c133a7272593706a38ef20648
 DIST lapack-3.3.0.tgz 6064824 RMD160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e SHA1 4f0b103da52110e7f60d1d7676727103aca9785e SHA256 bc531761287156e17476395c42664a15373723f54a6f80f192cda47771ec1225
 DIST lapack-3.3.1.tgz 4945204 RMD160 5e9d90122110045e07351f3ab30dc4e2b43d52db SHA1 3ce437e05f0e9a3c8148ec41922f6efeef0ebdac SHA256 56821ab51c29369a34e5085728f92c549a9aa926f26acf7eeac87b61eed329e4
 EBUILD atlas-3.8.3.ebuild 6019 RMD160 10c7b3937ec41c2c182f1faecbcf7c2e8901befe SHA1 15ebfd302a3764880fc599a7d1cdc59a214e3a27 SHA256 cc3139e44d2da073767df95280be90413fe39f5e02e0ce5243ff2267891d3e16
-EBUILD atlas-3.9.40-r1.ebuild 7282 RMD160 3f9462c3b30be41e1737d0d87093dbb4410ba300 SHA1 01e4e5a2e101576fd6c1ee83f15d488ce5975948 SHA256 0619a7228d59941e98a284ca8a2514a9640e31bd6c78fb9f0cdd86e8a16662a6
+EBUILD atlas-3.9.40-r1.ebuild 7287 RMD160 4ae056ecad1b7f4bd82f33a3b82d90bdee5069f2 SHA1 b1136d3fb273dae4459b5bfa49b4607e82d47141 SHA256 caf4b6143fcd6a3249f428ae6379c5390345d731d74fe1f8ac9e0e2a1e6627c5
 MISC ChangeLog 1179 RMD160 bd748f26de8ce3a28b374f008f24c24fecab200f SHA1 6ea21403379496bde2477272992dca40facba1c0 SHA256 a404d161ebfce79c60171fe6cfc1016c1d51a90b631b40521e9aab8bf5b51353
 MISC metadata.xml 726 RMD160 e43f5ea9c594bbe2174f6640bbfdccd8b17d4a68 SHA1 0ab8c05e7925b4716d8c94acd952bf3ab85165cb SHA256 27ef4eee7e645ad923644830d057db45d32342ad250ad903ff10915a9ca068fd

diff --git a/sci-libs/atlas/atlas-3.9.40-r1.ebuild b/sci-libs/atlas/atlas-3.9.40-r1.ebuild
index d39ec99..a756e53 100644
--- a/sci-libs/atlas/atlas-3.9.40-r1.ebuild
+++ b/sci-libs/atlas/atlas-3.9.40-r1.ebuild
@@ -125,7 +125,7 @@ atlas_install_pc() {
 		Description: ${PN} ${pcname}
 		Version: ${PV}
 		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -l${libname} "$@"
+		Libs: -L\${libdir} -l${libname} $@
 		Cflags: -I\${includedir}/${PN}
 		${PCREQ}
 	EOF
@@ -221,7 +221,7 @@ src_install() {
 	fi
 
 	if use fortran; then
-		LINK=$(tc-getF77)
+		LINK=$(tc-getF77) PCREQ=
 		# blas
 		atlas_install_libs libf77blas.a -lm -L. -latlas
 		atlas_install_pc f77blas atlas-blas -lm -latlas



^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/atlas/
@ 2011-04-29 17:12 Sebastien Fabbro
  0 siblings, 0 replies; 13+ messages in thread
From: Sebastien Fabbro @ 2011-04-29 17:12 UTC (permalink / raw
  To: gentoo-commits

commit:     05457c4257a0d3e82ad18c72b0efd94b8506d72e
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 17:12:18 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 17:12:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=05457c42

atlas revbump for linking

---
 sci-libs/atlas/ChangeLog                           |    7 +
 sci-libs/atlas/Manifest                            |    4 +-
 ...{atlas-3.9.40.ebuild => atlas-3.9.40-r1.ebuild} |  147 +++++++++++++-------
 3 files changed, 105 insertions(+), 53 deletions(-)

diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
index a0692cf..44edf90 100644
--- a/sci-libs/atlas/ChangeLog
+++ b/sci-libs/atlas/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*atlas-3.9.40-r1 (29 Apr 2011)
+
+  29 Apr 2011; Sébastien Fabbro <bicatali@gentoo.org> -atlas-3.9.40.ebuild,
+  +atlas-3.9.40-r1.ebuild:
+  Reworked entirely linking procedure: now explicitely treat each module blas,
+  cblas and lapack separately
+
 *atlas-3.9.40 (27 Apr 2011)
 
   27 Apr 2011; Sébastien Fabbro <bicatali@gentoo.org> -atlas-3.9.39.ebuild,

diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index 515ab10..bdd2049 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -4,6 +4,6 @@ DIST atlas3.9.40.tar.bz2 5483901 RMD160 8cb7568a287f063c133a7272593706a38ef20648
 DIST lapack-3.3.0.tgz 6064824 RMD160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e SHA1 4f0b103da52110e7f60d1d7676727103aca9785e SHA256 bc531761287156e17476395c42664a15373723f54a6f80f192cda47771ec1225
 DIST lapack-3.3.1.tgz 4945204 RMD160 5e9d90122110045e07351f3ab30dc4e2b43d52db SHA1 3ce437e05f0e9a3c8148ec41922f6efeef0ebdac SHA256 56821ab51c29369a34e5085728f92c549a9aa926f26acf7eeac87b61eed329e4
 EBUILD atlas-3.8.3.ebuild 6019 RMD160 10c7b3937ec41c2c182f1faecbcf7c2e8901befe SHA1 15ebfd302a3764880fc599a7d1cdc59a214e3a27 SHA256 cc3139e44d2da073767df95280be90413fe39f5e02e0ce5243ff2267891d3e16
-EBUILD atlas-3.9.40.ebuild 5980 RMD160 07bcffe734a77fa77c919913a4f3fb316a6f03a1 SHA1 1e4bdf4de8efaa303851025845bf7e80074c0d39 SHA256 4af07f31c40b2b4cfc3a84e7c26a727d6e37c3860d84f5b67d278a6bba395531
-MISC ChangeLog 933 RMD160 2191f3230749b57509cbd157b8f979455b247a9d SHA1 84302b19a83b696ca715985901f6ba0bcde11ef2 SHA256 f604d3e15cfbc0fcab74a35f0941e6cf36241b275f256e6d53a9282f895b5c9b
+EBUILD atlas-3.9.40-r1.ebuild 7282 RMD160 3f9462c3b30be41e1737d0d87093dbb4410ba300 SHA1 01e4e5a2e101576fd6c1ee83f15d488ce5975948 SHA256 0619a7228d59941e98a284ca8a2514a9640e31bd6c78fb9f0cdd86e8a16662a6
+MISC ChangeLog 1179 RMD160 bd748f26de8ce3a28b374f008f24c24fecab200f SHA1 6ea21403379496bde2477272992dca40facba1c0 SHA256 a404d161ebfce79c60171fe6cfc1016c1d51a90b631b40521e9aab8bf5b51353
 MISC metadata.xml 726 RMD160 e43f5ea9c594bbe2174f6640bbfdccd8b17d4a68 SHA1 0ab8c05e7925b4716d8c94acd952bf3ab85165cb SHA256 27ef4eee7e645ad923644830d057db45d32342ad250ad903ff10915a9ca068fd

diff --git a/sci-libs/atlas/atlas-3.9.40.ebuild b/sci-libs/atlas/atlas-3.9.40-r1.ebuild
similarity index 58%
rename from sci-libs/atlas/atlas-3.9.40.ebuild
rename to sci-libs/atlas/atlas-3.9.40-r1.ebuild
index be179e9..d39ec99 100644
--- a/sci-libs/atlas/atlas-3.9.40.ebuild
+++ b/sci-libs/atlas/atlas-3.9.40-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="fortran doc lapack openmp static-libs threads"
+IUSE="fortran doc lapack static-libs threads"
 
 RDEPEND="fortran? ( virtual/fortran )"
 DEPEND="${RDEPEND}
@@ -39,11 +39,9 @@ atlas_configure() {
 	# OpenMP shown to decreased performance over POSIX threads
 	# (at least in 3.9.39, see atlas-dev mailing list)
 	if use threads; then
-		myconf+=( "-t -1" )
-	elif use openmp; then
-		myconf+=( "-Si omp 2" )
+		myconf+=( "-t -1" "-Si omp 0" )
 	else
-		myconf+=( "-t 0" "-Si omp 0" )
+		myconf+=( "-t  0" "-Si omp 0" )
 	fi
 
 	if use amd64 || use ppc64 || use sparc; then
@@ -97,67 +95,42 @@ atlas_compile() {
 }
 
 # transform a static archive into a shared library and install them
-# atlas_install_libs <mylib.a> linking libraries
+# atlas_install_libs <mylib.a> [extra link flags]
 atlas_install_libs() {
 	local libname=$(basename ${1%.*})
 	einfo "Installing ${libname}"
 	local soname=${libname}.so.$(get_major_version)
 	shift
 	pushd "${S}_shared"/lib > /dev/null
-	$(tc-getCC) ${LDFLAGS} -shared -Wl,-soname=${soname} \
+	${LINK:-$(tc-getCC)} ${LDFLAGS} -shared -Wl,-soname=${soname} \
 		-Wl,--whole-archive ${libname}.a -Wl,--no-whole-archive \
 		"$@" -o ${soname} || die "Creating ${soname} failed"
 	dolib.so ${soname}
+	ln -s ${soname} ${soname%.*}
 	dosym ${soname} /usr/$(get_libdir)/${soname%.*}
 	popd > /dev/null
 	use static-libs && dolib.a "${S}_static"/lib/${libname}.a
 }
 
-# atlas_install_profile <lib>
-atlas_install_profile() {
-	local libname=$(basename ${1%.*})
-	local modname=$(echo ${libname} | sed -r -e 's/lib(pt|f77|ptf77|)//')
-	local profname=${PN}-${modname}
-	[[ ${libname} =~ pt ]] && profname=${profname}-threads
-	# avoid conflict with other implementations
-	if [[ ${libname} == lib${modname} ]]; then
-		mv ${libname}.a ${libname/lib/libatl}.a
-		libname=${libname/lib/libatl}
-	fi
-	atlas_install_libs ${libname} -L. -latlas ${PTLIBS}
-	cat <<-EOF > ${profname}.pc
+# create and install a pkgconfig file
+# atlas_install_pc <libname> <pkg name> [extra link flags]
+atlas_install_pc() {
+	local libname=${1} ; shift
+	local pcname=${1} ; shift
+	cat <<-EOF > ${pcname}.pc
 		prefix=${EPREFIX}/usr
 		libdir=\${prefix}/$(get_libdir)
 		includedir=\${prefix}/include
-		Name: ${profname}
-		Description: ${PN} ${profname}
+		Name: ${pcname}
+		Description: ${PN} ${pcname}
 		Version: ${PV}
 		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -l${libname#lib} -latlas ${PTLIBS}
-		Private: -lm
+		Libs: -L\${libdir} -l${libname} "$@"
+		Cflags: -I\${includedir}/${PN}
+		${PCREQ}
 	EOF
-
-	if [[ ${modname} == clapack ]]; then
-		echo "Cflags: -I\${includedir}/${PN}" >> ${profname}.pc
-		echo "Requires: cblas" >> ${profname}.pc
-	elif [[ ${modname} == cblas ]]; then
-		echo "Cflags: -I\${includedir}/${PN}" >> ${profname}.pc
-	elif [[ ${modname} == lapack ]]; then
-		echo "Requires: cblas blas" >> ${profname}.pc
-	fi
-
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${profname}.pc
-	[[ ${modname} == clapack ]] && return
-
-	if [[ ${modname} == cblas ]]; then
-		alternatives_for ${modname} ${profname} 0 \
-			/usr/$(get_libdir)/pkgconfig/${modname}.pc ${profname}.pc \
-			/usr/include/cblas.h ${PN}/cblas.h
-	else
-		alternatives_for ${modname} ${profname} 0 \
-			/usr/$(get_libdir)/pkgconfig/${modname}.pc ${profname}.pc
-	fi
+	doins ${pcname}.pc
 }
 
 pkg_setup() {
@@ -198,19 +171,91 @@ src_compile() {
 
 src_test() {
 	cd "${S}_shared"
-	emake -j1 check || die "emake check failed"
-	emake -j1 time || die "emake time failed"
+	emake -j1 check
+	emake -j1 time
 }
 
 src_install() {
 	cd "${S}_shared/lib"
-	[[ -e libptcblas.a ]] && PTLIBS="-lpthread"
-	atlas_install_libs libatlas.a -lm ${PTLIBS}
+	# rename to avoid collision with other packages
 	local l
-	for l in lib*{blas,lapack}.a; do
-		atlas_install_profile ${l}
+	for l in lib{,c}blas.a lib{,c}lapack.a ; do
+		if [[ -e ${l} ]]; then
+			mv ${l} ${l/lib/libatl}
+			use static-libs && mv "${S}"_static/lib/{${l},${l/lib/libatl}}
+		fi
 	done
 
+	[[ -e libptcblas.a ]] && PTLIBS="-lpthread"
+
+	# atlas
+	atlas_install_libs libatlas.a -lm ${PTLIBS}
+
+	# cblas
+	atlas_install_libs libatlcblas.a -lm -L. -latlas
+	atlas_install_pc atlcblas atlas-cblas -lm -latlas
+	alternatives_for cblas atlas 0 \
+		/usr/$(get_libdir)/pkgconfig/cblas.pc atlas-cblas.pc \
+		/usr/include/cblas.h atlas/cblas.h
+
+	# cblas threaded
+	if [[ -e libptcblas.a ]]; then
+		atlas_install_libs libptcblas.a -lm -L. -latlas ${PTLIBS}
+		atlas_install_pc ptcblas atlas-cblas-threads -lm -latlas ${PTLIBS}
+		alternatives_for cblas atlas-threads 0 \
+			/usr/$(get_libdir)/pkgconfig/cblas.pc atlas-cblas-threads.pc \
+			/usr/include/cblas.h atlas/cblas.h
+	fi
+
+	if use lapack; then
+		PCREQ="Requires: cblas"
+		# clapack
+		atlas_install_libs libatlclapack.a -lm -L. -latlas -latlcblas
+		atlas_install_pc atlclapack atlas-clapack -lm -latlas
+
+		# clapack threaded
+		if [[ -e libptclapack.a ]]; then
+			atlas_install_libs libptclapack.a -lm -L. -latlas -lptcblas ${PTLIBS}
+			atlas_install_pc ptclapack atlas-clapack-threads -lm -latlas ${PTLIBS}
+		fi
+	fi
+
+	if use fortran; then
+		LINK=$(tc-getF77)
+		# blas
+		atlas_install_libs libf77blas.a -lm -L. -latlas
+		atlas_install_pc f77blas atlas-blas -lm -latlas
+		alternatives_for blas atlas 0 \
+			/usr/$(get_libdir)/pkgconfig/blas.pc atlas-blas.pc
+
+		# blas threaded
+		if [[ -e libptf77blas.a ]]; then
+			atlas_install_libs libptf77blas.a -lm -L. -latlas ${PTLIBS}
+			atlas_install_pc ptf77blas atlas-blas-threads -lm -latlas ${PTLIBS}
+			alternatives_for blas atlas-threads 0 \
+				/usr/$(get_libdir)/pkgconfig/blas.pc atlas-blas-threads.pc
+		fi
+
+		if use lapack; then
+			PCREQ="Requires: blas cblas"
+			# lapack
+			atlas_install_libs libatllapack.a \
+				-lm -L. -latlas -latlcblas -lf77blas
+			atlas_install_pc atllapack atlas-lapack -lm -latlas
+			alternatives_for lapack atlas 0 \
+				/usr/$(get_libdir)/pkgconfig/lapack.pc atlas-lapack.pc
+			# lapack threaded
+			if [[ -e libptlapack.a ]]; then
+				atlas_install_libs libptlapack.a \
+					-lm -L. -latlas -lptcblas -lptf77blas ${PTLIBS}
+				atlas_install_pc ptlapack atlas-lapack-threads \
+					-lm -latlas ${PTLIBS}
+				alternatives_for lapack atlas-threads 0 \
+					/usr/$(get_libdir)/pkgconfig/lapack.pc atlas-lapack-threads.pc
+			fi
+		fi
+	fi
+
 	cd "${S}"
 	insinto /usr/include/${PN}
 	doins include/*.h



^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/atlas/
@ 2011-03-24 21:57 Sebastien Fabbro
  0 siblings, 0 replies; 13+ messages in thread
From: Sebastien Fabbro @ 2011-03-24 21:57 UTC (permalink / raw
  To: gentoo-commits

commit:     cf8577d7399fddc84eb2f9edecf78a666a2c838a
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 21:57:02 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 21:57:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=cf8577d7

remove extra lib in pkg-config linking

---
 sci-libs/atlas/Manifest            |    2 +-
 sci-libs/atlas/atlas-3.9.39.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index f76ea0b..cfceed8 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -2,6 +2,6 @@ DIST atlas3.8.3.tar.bz2 2527756 RMD160 0425e630d9d0c5b7aae81427a41b7eaa18447e90
 DIST atlas3.9.39.tar.bz2 5493831 RMD160 118ad28a6dab1633b55a4654a2b67688177dedb7 SHA1 025a62a6577035552cb48aeb45bb4270c3d66580 SHA256 ddb3804d3b2dada955f3b07f8c3b26aff274aaaa2de2211a15309aa892bc5c83
 DIST lapack-3.3.0.tgz 6064824 RMD160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e SHA1 4f0b103da52110e7f60d1d7676727103aca9785e SHA256 bc531761287156e17476395c42664a15373723f54a6f80f192cda47771ec1225
 EBUILD atlas-3.8.3.ebuild 6019 RMD160 10c7b3937ec41c2c182f1faecbcf7c2e8901befe SHA1 15ebfd302a3764880fc599a7d1cdc59a214e3a27 SHA256 cc3139e44d2da073767df95280be90413fe39f5e02e0ce5243ff2267891d3e16
-EBUILD atlas-3.9.39.ebuild 5875 RMD160 1903e0330eeab81b0ac3795e1bc42e3448d37b90 SHA1 9226bcf5b5053a7f3f8c7349e2c7cc2392ed03d8 SHA256 c12b5c962dc7f3baa0dee452e27ba45313bff0f1df2fc1a8444b50f1693cf52d
+EBUILD atlas-3.9.39.ebuild 5879 RMD160 702b18e5546453b51ce7155dc1fb145c60b29a92 SHA1 000fcea4b916cf09e8d7c6a042af3843ab70af97 SHA256 b78b9706318fb7ad30828b37c07ad697a8ce3e1be929f3d0c72268b74ac27908
 MISC ChangeLog 621 RMD160 755eab85fb123a94aa51ad5cd331f2a51191f1d0 SHA1 123bb45ac67e3048c72d06505fc665923cabce03 SHA256 0baa2873a98dc52777c96696648f06ad7b51473fa08b6fa0ca03964ab54af3b7
 MISC metadata.xml 726 RMD160 e43f5ea9c594bbe2174f6640bbfdccd8b17d4a68 SHA1 0ab8c05e7925b4716d8c94acd952bf3ab85165cb SHA256 27ef4eee7e645ad923644830d057db45d32342ad250ad903ff10915a9ca068fd

diff --git a/sci-libs/atlas/atlas-3.9.39.ebuild b/sci-libs/atlas/atlas-3.9.39.ebuild
index e58c435..ff66b88 100644
--- a/sci-libs/atlas/atlas-3.9.39.ebuild
+++ b/sci-libs/atlas/atlas-3.9.39.ebuild
@@ -132,7 +132,7 @@ atlas_install_profile() {
 		Description: ${PN} ${profname}
 		Version: ${PV}
 		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -l${libname} -latlas ${PTLIBS}
+		Libs: -L\${libdir} -l${libname#lib} -latlas ${PTLIBS}
 		Private: -lm
 	EOF
 



^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/atlas/
@ 2011-03-24 19:12 Sebastien Fabbro
  0 siblings, 0 replies; 13+ messages in thread
From: Sebastien Fabbro @ 2011-03-24 19:12 UTC (permalink / raw
  To: gentoo-commits

commit:     d29fa3ae3938881b80189385e8177206d71e40ed
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 19:11:50 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 19:11:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=d29fa3ae

removed include from blas and lapack profiles. cleaning.

---
 sci-libs/atlas/Manifest            |    2 +-
 sci-libs/atlas/atlas-3.9.39.ebuild |   17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index d7e1935..f76ea0b 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -2,6 +2,6 @@ DIST atlas3.8.3.tar.bz2 2527756 RMD160 0425e630d9d0c5b7aae81427a41b7eaa18447e90
 DIST atlas3.9.39.tar.bz2 5493831 RMD160 118ad28a6dab1633b55a4654a2b67688177dedb7 SHA1 025a62a6577035552cb48aeb45bb4270c3d66580 SHA256 ddb3804d3b2dada955f3b07f8c3b26aff274aaaa2de2211a15309aa892bc5c83
 DIST lapack-3.3.0.tgz 6064824 RMD160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e SHA1 4f0b103da52110e7f60d1d7676727103aca9785e SHA256 bc531761287156e17476395c42664a15373723f54a6f80f192cda47771ec1225
 EBUILD atlas-3.8.3.ebuild 6019 RMD160 10c7b3937ec41c2c182f1faecbcf7c2e8901befe SHA1 15ebfd302a3764880fc599a7d1cdc59a214e3a27 SHA256 cc3139e44d2da073767df95280be90413fe39f5e02e0ce5243ff2267891d3e16
-EBUILD atlas-3.9.39.ebuild 5623 RMD160 205da9970ab07f0a01faf9055cc796bbc3c05e31 SHA1 fc6c8a28f73fd761094ffdaae6b9fcd87c488271 SHA256 eda4ca0c4fc10fb0cc2601fa0f93e2f3a79d1c1275695232751b59dbf2f64abf
+EBUILD atlas-3.9.39.ebuild 5875 RMD160 1903e0330eeab81b0ac3795e1bc42e3448d37b90 SHA1 9226bcf5b5053a7f3f8c7349e2c7cc2392ed03d8 SHA256 c12b5c962dc7f3baa0dee452e27ba45313bff0f1df2fc1a8444b50f1693cf52d
 MISC ChangeLog 621 RMD160 755eab85fb123a94aa51ad5cd331f2a51191f1d0 SHA1 123bb45ac67e3048c72d06505fc665923cabce03 SHA256 0baa2873a98dc52777c96696648f06ad7b51473fa08b6fa0ca03964ab54af3b7
 MISC metadata.xml 726 RMD160 e43f5ea9c594bbe2174f6640bbfdccd8b17d4a68 SHA1 0ab8c05e7925b4716d8c94acd952bf3ab85165cb SHA256 27ef4eee7e645ad923644830d057db45d32342ad250ad903ff10915a9ca068fd

diff --git a/sci-libs/atlas/atlas-3.9.39.ebuild b/sci-libs/atlas/atlas-3.9.39.ebuild
index 5088452..e58c435 100644
--- a/sci-libs/atlas/atlas-3.9.39.ebuild
+++ b/sci-libs/atlas/atlas-3.9.39.ebuild
@@ -95,6 +95,8 @@ atlas_compile() {
 	popd > /dev/null
 }
 
+# transform a static archive into a shared library and install them
+# atlas_install_libs <mylib.a> linking libraries
 atlas_install_libs() {
 	local libname=$(basename ${1%.*})
 	einfo "Installing ${libname}"
@@ -110,7 +112,7 @@ atlas_install_libs() {
 	use static-libs && dolib.a "${S}_static"/lib/${libname}.a
 }
 
-# atlas_install_lib <lib>
+# atlas_install_profile <lib>
 atlas_install_profile() {
 	local libname=$(basename ${1%.*})
 	local modname=$(echo ${libname} | sed -r -e 's/lib(pt|f77|ptf77|)//')
@@ -121,7 +123,7 @@ atlas_install_profile() {
 		mv ${libname}.a ${libname/lib/libatl}.a
 		libname=${libname/lib/libatl}
 	fi
-	atlas_install_libs ${libname} -L. -latlas ${libs}
+	atlas_install_libs ${libname} -L. -latlas ${PTLIBS}
 	cat <<-EOF > ${profname}.pc
 		prefix=${EPREFIX}/usr
 		libdir=\${prefix}/$(get_libdir)
@@ -130,13 +132,15 @@ atlas_install_profile() {
 		Description: ${PN} ${profname}
 		Version: ${PV}
 		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -l${libname} ${LIBS}
+		Libs: -L\${libdir} -l${libname} -latlas ${PTLIBS}
 		Private: -lm
-		Cflags: -I\${includedir}/${PN}
 	EOF
 
 	if [[ ${modname} == clapack ]]; then
+		echo "Cflags: -I\${includedir}/${PN}" >> ${profname}.pc
 		echo "Requires: cblas" >> ${profname}.pc
+	elif [[ ${modname} == cblas ]]; then
+		echo "Cflags: -I\${includedir}/${PN}" >> ${profname}.pc
 	elif [[ ${modname} == lapack ]]; then
 		echo "Requires: cblas blas" >> ${profname}.pc
 	fi
@@ -195,9 +199,8 @@ src_test() {
 
 src_install() {
 	cd "${S}_shared/lib"
-	LIBS=-lm
-	[[ -e libptcblas.a ]] && LIBS="${libs} -lpthread"
-	atlas_install_libs libatlas.a
+	[[ -e libptcblas.a ]] && PTLIBS="-lpthread"
+	atlas_install_libs libatlas.a -lm ${PTLIBS}
 	local l
 	for l in lib*{blas,lapack}.a; do
 		atlas_install_profile ${l}



^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/atlas/
@ 2011-03-22 16:46 Sebastien Fabbro
  0 siblings, 0 replies; 13+ messages in thread
From: Sebastien Fabbro @ 2011-03-22 16:46 UTC (permalink / raw
  To: gentoo-commits

commit:     dc22f7c5cb79af17afcf3cdeb72925d85717e7ce
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 16:46:17 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 16:46:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=dc22f7c5

more shared library fix

---
 sci-libs/atlas/Manifest            |    2 +-
 sci-libs/atlas/atlas-3.9.39.ebuild |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index 7096c8c..d7e1935 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -2,6 +2,6 @@ DIST atlas3.8.3.tar.bz2 2527756 RMD160 0425e630d9d0c5b7aae81427a41b7eaa18447e90
 DIST atlas3.9.39.tar.bz2 5493831 RMD160 118ad28a6dab1633b55a4654a2b67688177dedb7 SHA1 025a62a6577035552cb48aeb45bb4270c3d66580 SHA256 ddb3804d3b2dada955f3b07f8c3b26aff274aaaa2de2211a15309aa892bc5c83
 DIST lapack-3.3.0.tgz 6064824 RMD160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e SHA1 4f0b103da52110e7f60d1d7676727103aca9785e SHA256 bc531761287156e17476395c42664a15373723f54a6f80f192cda47771ec1225
 EBUILD atlas-3.8.3.ebuild 6019 RMD160 10c7b3937ec41c2c182f1faecbcf7c2e8901befe SHA1 15ebfd302a3764880fc599a7d1cdc59a214e3a27 SHA256 cc3139e44d2da073767df95280be90413fe39f5e02e0ce5243ff2267891d3e16
-EBUILD atlas-3.9.39.ebuild 5650 RMD160 a52f86adea6577378591ed5b6f7f568e20705c23 SHA1 7dc8469871446b7ebe2ddb51e5f0e90323ee6ebe SHA256 5c486119893975227609ff8b56370d08a547dc5f38ff2831910061cdc4cdf8d2
+EBUILD atlas-3.9.39.ebuild 5623 RMD160 205da9970ab07f0a01faf9055cc796bbc3c05e31 SHA1 fc6c8a28f73fd761094ffdaae6b9fcd87c488271 SHA256 eda4ca0c4fc10fb0cc2601fa0f93e2f3a79d1c1275695232751b59dbf2f64abf
 MISC ChangeLog 621 RMD160 755eab85fb123a94aa51ad5cd331f2a51191f1d0 SHA1 123bb45ac67e3048c72d06505fc665923cabce03 SHA256 0baa2873a98dc52777c96696648f06ad7b51473fa08b6fa0ca03964ab54af3b7
 MISC metadata.xml 726 RMD160 e43f5ea9c594bbe2174f6640bbfdccd8b17d4a68 SHA1 0ab8c05e7925b4716d8c94acd952bf3ab85165cb SHA256 27ef4eee7e645ad923644830d057db45d32342ad250ad903ff10915a9ca068fd

diff --git a/sci-libs/atlas/atlas-3.9.39.ebuild b/sci-libs/atlas/atlas-3.9.39.ebuild
index 1d142cb..5088452 100644
--- a/sci-libs/atlas/atlas-3.9.39.ebuild
+++ b/sci-libs/atlas/atlas-3.9.39.ebuild
@@ -101,8 +101,7 @@ atlas_install_libs() {
 	local soname=${libname}.so.$(get_major_version)
 	shift
 	pushd "${S}_shared"/lib > /dev/null
-	$(tc-getCC) ${LDFLAGS}  -Wl,-soname=${soname} \
-		-shared -Wl,-soname=${soname} \
+	$(tc-getCC) ${LDFLAGS} -shared -Wl,-soname=${soname} \
 		-Wl,--whole-archive ${libname}.a -Wl,--no-whole-archive \
 		"$@" -o ${soname} || die "Creating ${soname} failed"
 	dolib.so ${soname}



^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/atlas/
@ 2011-03-22  4:10 Sebastien Fabbro
  0 siblings, 0 replies; 13+ messages in thread
From: Sebastien Fabbro @ 2011-03-22  4:10 UTC (permalink / raw
  To: gentoo-commits

commit:     1f00099ed40695d8995e98d79e44b081cf69a49f
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 04:09:08 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 04:09:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=1f00099e

fixed collision for cblas and lapack modules

---
 sci-libs/atlas/Manifest            |    2 +-
 sci-libs/atlas/atlas-3.9.39.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index a117b0c..7096c8c 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -2,6 +2,6 @@ DIST atlas3.8.3.tar.bz2 2527756 RMD160 0425e630d9d0c5b7aae81427a41b7eaa18447e90
 DIST atlas3.9.39.tar.bz2 5493831 RMD160 118ad28a6dab1633b55a4654a2b67688177dedb7 SHA1 025a62a6577035552cb48aeb45bb4270c3d66580 SHA256 ddb3804d3b2dada955f3b07f8c3b26aff274aaaa2de2211a15309aa892bc5c83
 DIST lapack-3.3.0.tgz 6064824 RMD160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e SHA1 4f0b103da52110e7f60d1d7676727103aca9785e SHA256 bc531761287156e17476395c42664a15373723f54a6f80f192cda47771ec1225
 EBUILD atlas-3.8.3.ebuild 6019 RMD160 10c7b3937ec41c2c182f1faecbcf7c2e8901befe SHA1 15ebfd302a3764880fc599a7d1cdc59a214e3a27 SHA256 cc3139e44d2da073767df95280be90413fe39f5e02e0ce5243ff2267891d3e16
-EBUILD atlas-3.9.39.ebuild 5649 RMD160 dbb82c3751348e40af78177c8cf88cf01fc14a8c SHA1 11d5799aab4bfbe60791dcfb7c8e5147b9b0aa43 SHA256 3d9f47d6559038b18cef20ca685db84289e706e1408a852dfa1902a4d71dd5a1
+EBUILD atlas-3.9.39.ebuild 5650 RMD160 a52f86adea6577378591ed5b6f7f568e20705c23 SHA1 7dc8469871446b7ebe2ddb51e5f0e90323ee6ebe SHA256 5c486119893975227609ff8b56370d08a547dc5f38ff2831910061cdc4cdf8d2
 MISC ChangeLog 621 RMD160 755eab85fb123a94aa51ad5cd331f2a51191f1d0 SHA1 123bb45ac67e3048c72d06505fc665923cabce03 SHA256 0baa2873a98dc52777c96696648f06ad7b51473fa08b6fa0ca03964ab54af3b7
 MISC metadata.xml 726 RMD160 e43f5ea9c594bbe2174f6640bbfdccd8b17d4a68 SHA1 0ab8c05e7925b4716d8c94acd952bf3ab85165cb SHA256 27ef4eee7e645ad923644830d057db45d32342ad250ad903ff10915a9ca068fd

diff --git a/sci-libs/atlas/atlas-3.9.39.ebuild b/sci-libs/atlas/atlas-3.9.39.ebuild
index 6fddc3e..1d142cb 100644
--- a/sci-libs/atlas/atlas-3.9.39.ebuild
+++ b/sci-libs/atlas/atlas-3.9.39.ebuild
@@ -114,7 +114,7 @@ atlas_install_libs() {
 # atlas_install_lib <lib>
 atlas_install_profile() {
 	local libname=$(basename ${1%.*})
-	local modname=$(echo ${libname} | sed -r -e 's/lib(pt|f77|ptf77)//')
+	local modname=$(echo ${libname} | sed -r -e 's/lib(pt|f77|ptf77|)//')
 	local profname=${PN}-${modname}
 	[[ ${libname} =~ pt ]] && profname=${profname}-threads
 	# avoid conflict with other implementations



^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] dev/bicatali:master commit in: sci-libs/atlas/
@ 2011-03-21 23:03 Sebastien Fabbro
  0 siblings, 0 replies; 13+ messages in thread
From: Sebastien Fabbro @ 2011-03-21 23:03 UTC (permalink / raw
  To: gentoo-commits

commit:     df50a7934ec314c24002161b15b8997174425894
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 23:02:42 2011 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 23:02:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/bicatali.git;a=commit;h=df50a793

atlas bump

---
 sci-libs/atlas/ChangeLog           |    6 +-
 sci-libs/atlas/Manifest            |    6 +-
 sci-libs/atlas/atlas-3.9.39.ebuild |  236 ++++++++++++++++++------------------
 3 files changed, 128 insertions(+), 120 deletions(-)

diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
index 2b114f0..d8f7da4 100644
--- a/sci-libs/atlas/ChangeLog
+++ b/sci-libs/atlas/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/atlas
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Mar 2011; Sébastien Fabbro <bicatali@gentoo.org> atlas-3.9.39.ebuild:
+  Version bump. Seriously refactored the ebuild. Now choose posix threads over
+  openmp when the two are enabled
+
 *atlas-3.9.32 (05 Dec 2010)
 
   05 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> atlas-3.8.3.ebuild,

diff --git a/sci-libs/atlas/Manifest b/sci-libs/atlas/Manifest
index f88ae73..a117b0c 100644
--- a/sci-libs/atlas/Manifest
+++ b/sci-libs/atlas/Manifest
@@ -1,7 +1,7 @@
 DIST atlas3.8.3.tar.bz2 2527756 RMD160 0425e630d9d0c5b7aae81427a41b7eaa18447e90 SHA1 c7546210df4796457d9e96a00444adc4c0f2e77f SHA256 e537168f2022db98b9029c8064815b5581620c12d782016138b1bf0bbb01f473
-DIST atlas3.9.37.tar.bz2 5449672 RMD160 87bb689e7a956df74ea4091552ac3cfd30430093 SHA1 71dd254dad1fc9ad3dec123a561706c9a1a5d7d1 SHA256 9f4380dfd5b024a52f5c8419d487c85b1c160eb06ac702a3c52350ef18e29cff
+DIST atlas3.9.39.tar.bz2 5493831 RMD160 118ad28a6dab1633b55a4654a2b67688177dedb7 SHA1 025a62a6577035552cb48aeb45bb4270c3d66580 SHA256 ddb3804d3b2dada955f3b07f8c3b26aff274aaaa2de2211a15309aa892bc5c83
 DIST lapack-3.3.0.tgz 6064824 RMD160 cc72e7c93ab13464fd892d684b00b910cbbd3b3e SHA1 4f0b103da52110e7f60d1d7676727103aca9785e SHA256 bc531761287156e17476395c42664a15373723f54a6f80f192cda47771ec1225
 EBUILD atlas-3.8.3.ebuild 6019 RMD160 10c7b3937ec41c2c182f1faecbcf7c2e8901befe SHA1 15ebfd302a3764880fc599a7d1cdc59a214e3a27 SHA256 cc3139e44d2da073767df95280be90413fe39f5e02e0ce5243ff2267891d3e16
-EBUILD atlas-3.9.37.ebuild 5910 RMD160 19b1474617f773c18046062ab52d2b41dcdbc8a0 SHA1 f2526da1e7c19c27d7f43177c4e81033e497842a SHA256 61f22142e56bad5c2a10775dd7432efc1cecfbefe8bc2220b35a569940b5b529
-MISC ChangeLog 431 RMD160 5029ae5bb2dbcffadeb2485dc2d661e16c4bb7c8 SHA1 48b805b587c2d16f4994ab0a94f1199c9ca74528 SHA256 27c95c5cd6c008e15c7e0dae1b3c6acee327c2b17de8646cee33d3efd66331bc
+EBUILD atlas-3.9.39.ebuild 5649 RMD160 dbb82c3751348e40af78177c8cf88cf01fc14a8c SHA1 11d5799aab4bfbe60791dcfb7c8e5147b9b0aa43 SHA256 3d9f47d6559038b18cef20ca685db84289e706e1408a852dfa1902a4d71dd5a1
+MISC ChangeLog 621 RMD160 755eab85fb123a94aa51ad5cd331f2a51191f1d0 SHA1 123bb45ac67e3048c72d06505fc665923cabce03 SHA256 0baa2873a98dc52777c96696648f06ad7b51473fa08b6fa0ca03964ab54af3b7
 MISC metadata.xml 726 RMD160 e43f5ea9c594bbe2174f6640bbfdccd8b17d4a68 SHA1 0ab8c05e7925b4716d8c94acd952bf3ab85165cb SHA256 27ef4eee7e645ad923644830d057db45d32342ad250ad903ff10915a9ca068fd

diff --git a/sci-libs/atlas/atlas-3.9.39.ebuild b/sci-libs/atlas/atlas-3.9.39.ebuild
index 861c26b..6fddc3e 100644
--- a/sci-libs/atlas/atlas-3.9.39.ebuild
+++ b/sci-libs/atlas/atlas-3.9.39.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 inherit eutils toolchain-funcs multilib versionator alternatives-2
 
 LAPACKP=lapack-3.3.0
@@ -15,45 +15,14 @@ SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="fortran doc lapack openmp static-libs"
+IUSE="fortran doc lapack openmp static-libs threads"
 
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/ATLAS"
 
-make_shared_lib() {
-	local soname=$(basename "${1%.a}").so.${3:-$(get_major_version)}
-	einfo "Making ${soname}"
-	${2} ${LDFLAGS}  \
-		-shared -Wl,-soname="${soname}" \
-		-Wl,--whole-archive "${1}" -Wl,--no-whole-archive \
-		-o $(dirname "${1}")/"${soname}" || return 1
-}
-
-pkg_setup() {
-	if [[ -n $(type -P cpufreq-info) ]]; then
-		[[ -z $(cpufreq-info -d) ]] && return
-		local ncpu=$(LANG=C cpufreq-info | grep -c "analyzing CPU")
-		local cpu=0
-		while [[ ${cpu} -lt ${ncpu} ]]; do
-			if "$(LANG=C cpufreq-info -p -c ${cpu} | grep -q performance)"; then
-				ewarn "CPU $cpu is not set to performance"
-				ewarn "Run sudo cpufreq-set -g performance -c <CPU #> for all CPUs"
-				die "${PN} needs all cpu set to performance"
-			fi
-			cpu=$(( cpu + 1 ))
-		done
-	else
-		ewarn "Please make sure to disable CPU throttling completely"
-		ewarn "during the compile of ${PN}. Otherwise, all ${PN}"
-		ewarn "generated timings will be completely random and the"
-		ewarn "performance of the resulting libraries will be degraded"
-		ewarn "considerably."
-	fi
-}
-
-src_configure() {
+atlas_configure() {
 	local myconf=(
 		"--prefix=${ED}/usr"
 		"--libdir=${ED}/usr/$(get_libdir)"
@@ -63,10 +32,19 @@ src_configure() {
 		"-D c -DWALL"
 		"-F ac '${CFLAGS}'"
 		"-Si cputhrchk 0"
-		$(use openmp && echo "-Si omp 1" || echo "-Si omp 0")
 		"-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
 	)
 
+	# OpenMP shown to decreased performance over POSIX threads
+	# (at least in 3.9.39, see atlas-dev mailing list)
+	if use threads; then
+		myconf+=( "-t -1" )
+	elif use openmp; then
+		myconf+=( "-Si omp 2" )
+	else
+		myconf+=( "-t 0" "-Si omp 0" )
+	fi
+
 	if use amd64 || use ppc64 || use sparc; then
 		if [ ${ABI} = amd64 ] || [ ${ABI} = ppc64 ] || [ ${ABI} = sparc64 ] ; then
 			myconf+=( "-b 64" )
@@ -101,112 +79,138 @@ src_configure() {
 			"--nof77"
 		)
 	fi
-
-	if use static-libs; then
-		mkdir "${S}_build_static" && cd "${S}_build_static"
-		"${S}"/configure ${myconf[@]} || die "configure static failed"
-	fi
-
-	mkdir "${S}_build_shared" && cd "${S}_build_shared"
-	myconf+=( "-Fa alg -fPIC" )
-	"${S}"/configure ${myconf[@]} || die "configure shared failed"
+	local confdir="${S}_${1}"; shift
+	myconf+=( $@ )
+	mkdir "${confdir}" && cd "${confdir}"
+	"${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
 }
 
-src_compile() {
+atlas_compile() {
+	pushd "${S}_${1}" > /dev/null
 	# atlas does its own parallel builds
-	if use static-libs; then
-		cd "${S}_build_static"
-		emake -j1 build || die "emake static failed"
-		cd lib
-		emake libclapack.a || die
-		# rename to avoid collisions
-		mv lib{,a}cblas.a && [[ -e liblapack.a ]] && mv lib{,a}lapack.a
-	fi
-	cd "${S}_build_shared"
-	emake -j1 build || die "emake static with PIC failed"
+	emake -j1 build
 	cd lib
-	emake libclapack.a || die
-	# rename to avoid collisions
-	mv lib{,a}cblas.a && [[ -e liblapack.a ]] && mv lib{,a}lapack.a
-	make_shared_lib libatlas.a $(tc-getCC) || die
-	make_shared_lib libacblas.a $(tc-getCC) 1 || die
-	make_shared_lib libclapack.a $(tc-getCC) || die
-	if use fortran; then
-		make_shared_lib libf77blas.a $(tc-getFC) 1 || die
-		use lapack && make_shared_lib libalapack.a $(tc-getFC) 3 || die
-	fi
-	if [[ -e libptcblas.a ]]; then
-		make_shared_lib libptcblas.a $(tc-getCC) 1 || die
-		use fortran && make_shared_lib libptf77blas.a $(tc-getCC) 1 || die
-	fi
+	emake libclapack.a
+	[[ -e libptcblas.a ]] && emake libptclapack.a
+	popd > /dev/null
 }
 
-src_test() {
-	cd "${S}_build_shared"
-	emake -j1 check || die "emake check failed"
-	emake -j1 time || die "emake time failed"
+atlas_install_libs() {
+	local libname=$(basename ${1%.*})
+	einfo "Installing ${libname}"
+	local soname=${libname}.so.$(get_major_version)
+	shift
+	pushd "${S}_shared"/lib > /dev/null
+	$(tc-getCC) ${LDFLAGS}  -Wl,-soname=${soname} \
+		-shared -Wl,-soname=${soname} \
+		-Wl,--whole-archive ${libname}.a -Wl,--no-whole-archive \
+		"$@" -o ${soname} || die "Creating ${soname} failed"
+	dolib.so ${soname}
+	dosym ${soname} /usr/$(get_libdir)/${soname%.*}
+	popd > /dev/null
+	use static-libs && dolib.a "${S}_static"/lib/${libname}.a
 }
 
-# atlas_make_profile <blas|cblas|lapack> <lib>
-atlas_make_profile() {
-	local name=${1}; shift
-	local prof=${PN}-${name}
-	[[ ${libs} =~ pt ]] && 	prof=${prof}-threads
-	cat <<-EOF > ${prof}.pc
+# atlas_install_lib <lib>
+atlas_install_profile() {
+	local libname=$(basename ${1%.*})
+	local modname=$(echo ${libname} | sed -r -e 's/lib(pt|f77|ptf77)//')
+	local profname=${PN}-${modname}
+	[[ ${libname} =~ pt ]] && profname=${profname}-threads
+	# avoid conflict with other implementations
+	if [[ ${libname} == lib${modname} ]]; then
+		mv ${libname}.a ${libname/lib/libatl}.a
+		libname=${libname/lib/libatl}
+	fi
+	atlas_install_libs ${libname} -L. -latlas ${libs}
+	cat <<-EOF > ${profname}.pc
 		prefix=${EPREFIX}/usr
 		libdir=\${prefix}/$(get_libdir)
 		includedir=\${prefix}/include
-		Name: ${prof}
-		Description: ${DESCRIPTION} ${name} implementation
+		Name: ${profname}
+		Description: ${PN} ${profname}
 		Version: ${PV}
 		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} $@ -latlas
+		Libs: -L\${libdir} -l${libname} ${LIBS}
 		Private: -lm
 		Cflags: -I\${includedir}/${PN}
-		$([[ ${1} == lapack ]] && echo "Requires: cblas blas")
 	EOF
+
+	if [[ ${modname} == clapack ]]; then
+		echo "Requires: cblas" >> ${profname}.pc
+	elif [[ ${modname} == lapack ]]; then
+		echo "Requires: cblas blas" >> ${profname}.pc
+	fi
+
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${prof}.pc || die
-	if [[ ${name} == cblas ]]; then
-		alternatives_for ${name} ${prof} 0 \
-			"/usr/$(get_libdir)/pkgconfig/${name}.pc" "${prof}.pc" \
-			"/usr/include/cblas.h" "${PN}/cblas.h"
+	doins ${profname}.pc
+	[[ ${modname} == clapack ]] && return
+
+	if [[ ${modname} == cblas ]]; then
+		alternatives_for ${modname} ${profname} 0 \
+			/usr/$(get_libdir)/pkgconfig/${modname}.pc ${profname}.pc \
+			/usr/include/cblas.h ${PN}/cblas.h
 	else
-		alternatives_for ${name} ${prof} 0 \
-			"/usr/$(get_libdir)/pkgconfig/${name}.pc" "${prof}.pc"
+		alternatives_for ${modname} ${profname} 0 \
+			/usr/$(get_libdir)/pkgconfig/${modname}.pc ${profname}.pc
 	fi
 }
 
+pkg_setup() {
+	if [[ -n $(type -P cpufreq-info) ]]; then
+		[[ -z $(cpufreq-info -d) ]] && return
+		local ncpu=$(LANG=C cpufreq-info | grep -c "analyzing CPU")
+		local cpu=0
+		while [[ ${cpu} -lt ${ncpu} ]]; do
+			if "$(LANG=C cpufreq-info -p -c ${cpu} | grep -q performance)"; then
+				ewarn "CPU $cpu is not set to performance"
+				ewarn "Run sudo cpufreq-set -g performance -c <CPU #> for all CPUs"
+				die "${PN} needs all cpu set to performance"
+			fi
+			cpu=$(( cpu + 1 ))
+		done
+	else
+		ewarn "Please make sure to disable CPU throttling completely"
+		ewarn "during the compile of ${PN}. Otherwise, all ${PN}"
+		ewarn "generated timings will be completely random and the"
+		ewarn "performance of the resulting libraries will be degraded"
+		ewarn "considerably."
+	fi
+}
+
+src_configure() {
+	atlas_configure shared "-Fa alg -fPIC"
+	use static-libs && atlas_configure static
+}
+
+src_compile() {
+	atlas_compile shared
+	use static-libs && atlas_compile static
+}
+
+src_test() {
+	cd "${S}_shared"
+	emake -j1 check || die "emake check failed"
+	emake -j1 time || die "emake time failed"
+}
+
 src_install() {
-	# do a loop to make sure we install the same in shared/static
+	cd "${S}_shared/lib"
+	LIBS=-lm
+	[[ -e libptcblas.a ]] && LIBS="${libs} -lpthread"
+	atlas_install_libs libatlas.a
 	local l
-	for l in "${S}_build_shared"/lib/lib*.so.*; do
-		if use static-libs; then
-			dolib.a "${l/_shared/_static}".a || die
-		fi
-		dolib.so "${l}" || die
-		l=$(basename "${l}")
-		dosym ${l} /usr/$(get_libdir)/${l%.*}
+	for l in lib*{blas,lapack}.a; do
+		atlas_install_profile ${l}
 	done
-	atlas_make_profile cblas -lacblas
-	if use fortran; then
-		atlas_make_profile blas -lf77blas
-		use lapack && atlas_make_profile lapack -lalapack
-	fi
-	if [[ -e ${S}_build_shared/lib/libptcblas.a ]]; then
-		atlas_make_profile cblas -lptcblas -lpthread
-		use fortran && atlas_make_profile blas -lptf77blas -lpthread
-	fi
+
+	cd "${S}"
 	insinto /usr/include/${PN}
-	doins include/*.h || die
-	dosym atlas/clapack.h /usr/include/clapack.h
+	doins include/*.h
 
-	cd doc
+	cd "${S}/doc"
 	dodoc INDEX.txt AtlasCredits.txt ChangeLog
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins atlas*pdf cblas.pdf cblasqref.pdf || die "doins docs failed"
-		use fortran && doins f77blas*pdf
-		use fortran && doins lapack*pdf
-	fi
+	use doc && dodoc atlas*pdf cblas.pdf cblasqref.pdf
+	use doc && use fortran && dodoc f77blas*pdf
+	use doc && use fortran && use lapack && dodoc lapack*pdf
 }



^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2011-08-05 18:40 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-27 20:38 [gentoo-commits] dev/bicatali:master commit in: sci-libs/atlas/ Sebastien Fabbro
  -- strict thread matches above, loose matches on Subject: below --
2011-08-05 18:40 Sebastien Fabbro
2011-07-25 16:54 Sebastien Fabbro
2011-05-23 18:44 Sebastien Fabbro
2011-05-23 18:44 Sebastien Fabbro
2011-05-17 17:16 Sebastien Fabbro
2011-04-29 17:28 Sebastien Fabbro
2011-04-29 17:12 Sebastien Fabbro
2011-03-24 21:57 Sebastien Fabbro
2011-03-24 19:12 Sebastien Fabbro
2011-03-22 16:46 Sebastien Fabbro
2011-03-22  4:10 Sebastien Fabbro
2011-03-21 23:03 Sebastien Fabbro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox