* [gentoo-commits] proj/sci:master commit in: sci-libs/atlas/, sci-libs/atlas/files/
@ 2011-08-04 0:06 Andrea Arteaga
0 siblings, 0 replies; 9+ messages in thread
From: Andrea Arteaga @ 2011-08-04 0:06 UTC (permalink / raw
To: gentoo-commits
commit: 19c58db29ec6506f60cfed3f00d9668329051c1b
Author: Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
AuthorDate: Thu Aug 4 00:05:30 2011 +0000
Commit: Andrea Arteaga <andyspiros <AT> gmail <DOT> com>
CommitDate: Thu Aug 4 00:05:30 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=19c58db2
Version bump. atlas imported from the bicatali overlay.
---
sci-libs/atlas/ChangeLog | 57 +++++
sci-libs/atlas/atlas-3.9.46.ebuild | 267 ++++++++++++++++++++++++
sci-libs/atlas/files/3.9.39-bfr-overflow.patch | 72 +++++++
sci-libs/atlas/metadata.xml | 16 ++
4 files changed, 412 insertions(+), 0 deletions(-)
diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
new file mode 100644
index 0000000..bf4e5d4
--- /dev/null
+++ b/sci-libs/atlas/ChangeLog
@@ -0,0 +1,57 @@
+# ChangeLog for sci-libs/atlas
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*atlas-3.9.46 (03 Aug 2011)
+
+ 03 Aug 2011; Andrea Arteaga <andyspiros@gmail.com> -atlas-3.8.4.ebuild,
+ -atlas-3.9.41.ebuild, +atlas-3.9.46.ebuild
+ Version bump and import from bicatali
+
+*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
+
+*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,
+ +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,
+ +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
+
+*atlas-3.9.39 (21 Mar 2011)
+
+ 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,
+ +atlas-3.9.32.ebuild:
+ Version bump. Still beta.
+
+ 03 Dec 2010; Sébastien Fabbro <bicatali@gentoo.org> atlas-3.8.3.ebuild,
+ metadata.xml:
+ Initial import. Ebuilds merged from blas-atlas and lapack-atlas.
+
diff --git a/sci-libs/atlas/atlas-3.9.46.ebuild b/sci-libs/atlas/atlas-3.9.46.ebuild
new file mode 100644
index 0000000..78104f3
--- /dev/null
+++ b/sci-libs/atlas/atlas-3.9.46.ebuild
@@ -0,0 +1,267 @@
+# 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"
+ 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() {
+ 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
+}
diff --git a/sci-libs/atlas/files/3.9.39-bfr-overflow.patch b/sci-libs/atlas/files/3.9.39-bfr-overflow.patch
new file mode 100644
index 0000000..a4ae52a
--- /dev/null
+++ b/sci-libs/atlas/files/3.9.39-bfr-overflow.patch
@@ -0,0 +1,72 @@
+ ATLAS/tune/blas/level1/axpysrch.c | 2 +-
+ ATLAS/tune/blas/level1/copysrch.c | 2 +-
+ ATLAS/tune/blas/level1/iamaxsrch.c | 2 +-
+ ATLAS/tune/blas/level1/scalsrch.c | 2 +-
+ ATLAS/tune/blas/level1/swapsrch.c | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/ATLAS/tune/blas/level1/axpysrch.c b/ATLAS/tune/blas/level1/axpysrch.c
+index 48bd756..f7f7845 100644
+--- a/ATLAS/tune/blas/level1/axpysrch.c
++++ b/ATLAS/tune/blas/level1/axpysrch.c
+@@ -159,7 +159,7 @@ FILENODE *ReadFile(char pre)
+ {
+ FILE *fpin;
+ FILENODE *fbase, *fn, *fp=NULL;
+- char ln[512], rout[256], auth[256], cc[256], ccflags[256];
++ char ln[512], rout[256], auth[256], cc[256], ccflags[512];
+ char *pcc, *pccflags;
+ int i, n, ID, alpha, beta, incX, incY;
+
+diff --git a/ATLAS/tune/blas/level1/copysrch.c b/ATLAS/tune/blas/level1/copysrch.c
+index 3a9fcfc..736f501 100644
+--- a/ATLAS/tune/blas/level1/copysrch.c
++++ b/ATLAS/tune/blas/level1/copysrch.c
+@@ -159,7 +159,7 @@ FILENODE *ReadFile(char pre)
+ {
+ FILE *fpin;
+ FILENODE *fbase, *fn, *fp=NULL;
+- char ln[512], rout[256], auth[256], cc[256], ccflags[256];
++ char ln[512], rout[256], auth[256], cc[256], ccflags[512];
+ char *pcc, *pccflags;
+ int i, n, ID, alpha, beta, incX, incY;
+
+diff --git a/ATLAS/tune/blas/level1/iamaxsrch.c b/ATLAS/tune/blas/level1/iamaxsrch.c
+index e9e766a..91b3acd 100644
+--- a/ATLAS/tune/blas/level1/iamaxsrch.c
++++ b/ATLAS/tune/blas/level1/iamaxsrch.c
+@@ -159,7 +159,7 @@ FILENODE *ReadFile(char pre)
+ {
+ FILE *fpin;
+ FILENODE *fbase, *fn, *fp=NULL;
+- char ln[512], rout[256], auth[256], cc[256], ccflags[256];
++ char ln[512], rout[256], auth[256], cc[256], ccflags[512];
+ char *pcc, *pccflags;
+ int i, n, ID, alpha, beta, incX, incY;
+
+diff --git a/ATLAS/tune/blas/level1/scalsrch.c b/ATLAS/tune/blas/level1/scalsrch.c
+index 48be97e..35d724d 100644
+--- a/ATLAS/tune/blas/level1/scalsrch.c
++++ b/ATLAS/tune/blas/level1/scalsrch.c
+@@ -159,7 +159,7 @@ FILENODE *ReadFile(char pre)
+ {
+ FILE *fpin;
+ FILENODE *fbase, *fn, *fp=NULL;
+- char ln[512], rout[256], auth[256], cc[256], ccflags[256];
++ char ln[512], rout[256], auth[256], cc[256], ccflags[512];
+ char *pcc, *pccflags;
+ int i, n, ID, alpha, beta, incX, incY;
+
+diff --git a/ATLAS/tune/blas/level1/swapsrch.c b/ATLAS/tune/blas/level1/swapsrch.c
+index 776d2d7..5281ae5 100644
+--- a/ATLAS/tune/blas/level1/swapsrch.c
++++ b/ATLAS/tune/blas/level1/swapsrch.c
+@@ -159,7 +159,7 @@ FILENODE *ReadFile(char pre)
+ {
+ FILE *fpin;
+ FILENODE *fbase, *fn, *fp=NULL;
+- char ln[512], rout[256], auth[256], cc[256], ccflags[256];
++ char ln[512], rout[256], auth[256], cc[256], ccflags[512];
+ char *pcc, *pccflags;
+ int i, n, ID, alpha, beta, incX, incY;
+
diff --git a/sci-libs/atlas/metadata.xml b/sci-libs/atlas/metadata.xml
new file mode 100644
index 0000000..93eedfb
--- /dev/null
+++ b/sci-libs/atlas/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<longdescription lang='en'>
+ ATLAS is an approach for the automatic generation and optimization of
+ numerical software. Currently ATLAS supplies optimized versions for the
+ complete set of linear algebra kernels known as the Basic Linear Algebra
+ Subroutines (BLAS) for both c and F77 interfaces. It can also build
+ a subset of the linear algebra routine LAPACK library or the full
+ LAPACK using the reference LAPACK from Netlib.
+</longdescription>
+<use>
+ <flag name='xblas'>Build LAPACK with extra precision (needs <pkg>sci-libs/xblas</pkg>)</flag>
+</use>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/atlas/, sci-libs/atlas/files/
@ 2012-01-24 5:55 Sebastien Fabbro
0 siblings, 0 replies; 9+ messages in thread
From: Sebastien Fabbro @ 2012-01-24 5:55 UTC (permalink / raw
To: gentoo-commits
commit: c39a168fe9ebaf8aa1a53b81b680583e99caad73
Author: Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Tue Jan 24 05:54:20 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 05:54:20 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c39a168f
sci-libs/atlas: Version bump
(Portage version: 2.1.10.41/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/atlas/ChangeLog | 9 +-
sci-libs/atlas/atlas-3.9.47.ebuild | 267 --------------------
sci-libs/atlas/atlas-3.9.49.ebuild | 267 --------------------
.../{atlas-3.9.46.ebuild => atlas-3.9.63.ebuild} | 12 +-
sci-libs/atlas/files/3.9.63-leaks.patch | 29 +++
5 files changed, 45 insertions(+), 539 deletions(-)
diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
index ad02b93..c702930 100644
--- a/sci-libs/atlas/ChangeLog
+++ b/sci-libs/atlas/ChangeLog
@@ -1,7 +1,14 @@
# ChangeLog for sci-libs/atlas
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*atlas-3.9.63 (24 Jan 2012)
+
+ 24 Jan 2012; Sébastien Fabbro <bicatali@gentoo.org>
+ +files/3.9.63-leaks.patch, -atlas-3.9.46.ebuild, -atlas-3.9.47.ebuild,
+ -atlas-3.9.49.ebuild, +atlas-3.9.63.ebuild:
+ Version bump
+
*atlas-3.9.52 (12 Oct 2001)
12 Oct 2011; Andrea Arteaga <andyspiros@gmail.com> +atlas-3.9.52.ebuild:
diff --git a/sci-libs/atlas/atlas-3.9.47.ebuild b/sci-libs/atlas/atlas-3.9.47.ebuild
deleted file mode 100644
index 86157c9..0000000
--- a/sci-libs/atlas/atlas-3.9.47.ebuild
+++ /dev/null
@@ -1,267 +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 ~amd64-linux"
-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"
- 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() {
- 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
-}
diff --git a/sci-libs/atlas/atlas-3.9.49.ebuild b/sci-libs/atlas/atlas-3.9.49.ebuild
deleted file mode 100644
index 86157c9..0000000
--- a/sci-libs/atlas/atlas-3.9.49.ebuild
+++ /dev/null
@@ -1,267 +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 ~amd64-linux"
-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"
- 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() {
- 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
-}
diff --git a/sci-libs/atlas/atlas-3.9.46.ebuild b/sci-libs/atlas/atlas-3.9.63.ebuild
similarity index 96%
rename from sci-libs/atlas/atlas-3.9.46.ebuild
rename to sci-libs/atlas/atlas-3.9.63.ebuild
index 86157c9..a3975eb 100644
--- a/sci-libs/atlas/atlas-3.9.46.ebuild
+++ b/sci-libs/atlas/atlas-3.9.63.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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
+LAPACKP=lapack-3.4.0
DESCRIPTION="Automatically Tuned Linear Algebra Software"
HOMEPAGE="http://math-atlas.sourceforge.net/"
@@ -24,9 +24,10 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/ATLAS"
atlas_configure() {
+ # hack needed to trick the flaky gcc detection
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)"
@@ -39,7 +40,7 @@ atlas_configure() {
)
# OpenMP shown to decreased performance over POSIX threads
- # (at least in 3.9.39, see atlas-dev mailing list)
+ # (at least in 3.9.x, see atlas-dev mailing list)
if use threads; then
myconf+=( "-t -1" "-Si omp 0" )
else
@@ -80,6 +81,8 @@ atlas_configure() {
local confdir="${S}_${1}"; shift
myconf+=( $@ )
mkdir "${confdir}" && cd "${confdir}"
+ # for debugging
+ echo ${myconf[@]} > myconf.out
"${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
}
@@ -156,6 +159,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/3.9.39-bfr-overflow.patch
+ epatch "${FILESDIR}"/3.9.63-leaks.patch
}
src_configure() {
diff --git a/sci-libs/atlas/files/3.9.63-leaks.patch b/sci-libs/atlas/files/3.9.63-leaks.patch
new file mode 100644
index 0000000..d87e9c9
--- /dev/null
+++ b/sci-libs/atlas/files/3.9.63-leaks.patch
@@ -0,0 +1,29 @@
+--- CONFIG/src/atlconf_misc.c.orig 2012-01-11 16:00:42.000000000 +0000
++++ CONFIG/src/atlconf_misc.c 2012-01-23 19:33:37.000000000 +0000
+@@ -439,6 +439,7 @@
+ assert(cmnd);
+ sprintf(cmnd, "%s -m", uname);
+ res = atlsys_1L(targ, cmnd, 0, 0);
++ free(cmnd);
+ if (res)
+ {
+ if (strstr(res, "ppc") || strstr(res, "Power Macintosh") ||
+@@ -707,6 +708,7 @@
+ assert(cmnd);
+ sprintf(cmnd, "%s --version", comp);
+ res = atlsys_1L(NULL, cmnd, 0, 0);
++ free(cmnd);
+ if (res)
+ {
+ /*
+--- CONFIG/src/config.c.orig 2012-01-23 19:41:11.000000000 +0000
++++ CONFIG/src/config.c 2012-01-24 04:46:25.000000000 +0000
+@@ -1102,7 +1105,7 @@
+ else if (!strcmp(sp0, "kern"))
+ gcc3 = sp;
+ else if (!strcmp(sp0, "pmake"))
+- *pmake = sp;
++ *pmake = NewStringCopy(sp);
+ else if (!strcmp(sp0, "flapack"))
+ *flapack = sp;
+ else if (!strcmp(sp0, "f77lib"))
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/atlas/, sci-libs/atlas/files/
@ 2012-07-03 22:06 Sebastien Fabbro
0 siblings, 0 replies; 9+ messages in thread
From: Sebastien Fabbro @ 2012-07-03 22:06 UTC (permalink / raw
To: gentoo-commits
commit: 26a497ed8c582fca811d58dc53ba88b3d9052ff0
Author: Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Tue Jul 3 22:06:32 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jul 3 22:06:32 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=26a497ed
sci-libs/atlas: version bump. Adapt calls to compilers. Inherit multilib
(Portage version: 2.2.01.20430-prefix/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/atlas/ChangeLog | 6 ++++
.../{atlas-3.9.80.ebuild => atlas-3.9.82.ebuild} | 20 +++++--------
sci-libs/atlas/files/3.9.63-leaks.patch | 29 --------------------
3 files changed, 14 insertions(+), 41 deletions(-)
diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
index 90dd1cd..8fcf843 100644
--- a/sci-libs/atlas/ChangeLog
+++ b/sci-libs/atlas/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*atlas-3.9.82 (03 Jul 2012)
+
+ 03 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> +atlas-3.9.82.ebuild,
+ -atlas-3.9.80.ebuild, -files/3.9.63-leaks.patch:
+ sci-libs/atlas: version bump. Adapt calls to compilers. Inherit multilib
+
*atlas-3.9.80 (26 Jun 2012)
26 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org> -atlas-3.9.79.ebuild,
diff --git a/sci-libs/atlas/atlas-3.9.80.ebuild b/sci-libs/atlas/atlas-3.9.82.ebuild
similarity index 96%
rename from sci-libs/atlas/atlas-3.9.80.ebuild
rename to sci-libs/atlas/atlas-3.9.82.ebuild
index 311fef2..fa414ab 100644
--- a/sci-libs/atlas/atlas-3.9.80.ebuild
+++ b/sci-libs/atlas/atlas-3.9.82.ebuild
@@ -3,7 +3,7 @@
# $Header: $
EAPI=4
-inherit eutils toolchain-funcs fortran-2 versionator alternatives-2
+inherit eutils toolchain-funcs fortran-2 versionator alternatives-2 multilib
LAPACKP=lapack-3.4.1.tgz
@@ -48,18 +48,14 @@ pkg_setup() {
src_configure() {
atlas_configure() {
- # hack needed to trick the flaky gcc detection
- local mycc="$(tc-getCC)"
- [[ ${mycc} == *gcc* ]] && mycc=gcc
-
local myconf=(
- "--prefix=${ED}/usr"
- "--libdir=${ED}/usr/$(get_libdir)"
- "--incdir=${ED}/usr/include"
- "--cc=${mycc}"
- "-C ac ${mycc}"
+ --prefix="${ED}/usr"
+ --libdir="${ED}/usr/$(get_libdir)"
+ --incdir="${ED}/usr/include"
+ --cc="$(tc-getCC)"
+ "-C acg '$(type -P $(tc-getCC))'"
"-D c -DWALL"
- "-F ac '${CFLAGS}'"
+ "-F acg '${CFLAGS}'"
"-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
)
@@ -88,7 +84,7 @@ src_configure() {
fi
if use fortran; then
myconf+=(
- "-C if $(tc-getFC)"
+ "-C if '$(type -P $(tc-getFC))'"
"-F if '${FFLAGS}'"
)
if use lapack; then
diff --git a/sci-libs/atlas/files/3.9.63-leaks.patch b/sci-libs/atlas/files/3.9.63-leaks.patch
deleted file mode 100644
index d87e9c9..0000000
--- a/sci-libs/atlas/files/3.9.63-leaks.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- CONFIG/src/atlconf_misc.c.orig 2012-01-11 16:00:42.000000000 +0000
-+++ CONFIG/src/atlconf_misc.c 2012-01-23 19:33:37.000000000 +0000
-@@ -439,6 +439,7 @@
- assert(cmnd);
- sprintf(cmnd, "%s -m", uname);
- res = atlsys_1L(targ, cmnd, 0, 0);
-+ free(cmnd);
- if (res)
- {
- if (strstr(res, "ppc") || strstr(res, "Power Macintosh") ||
-@@ -707,6 +708,7 @@
- assert(cmnd);
- sprintf(cmnd, "%s --version", comp);
- res = atlsys_1L(NULL, cmnd, 0, 0);
-+ free(cmnd);
- if (res)
- {
- /*
---- CONFIG/src/config.c.orig 2012-01-23 19:41:11.000000000 +0000
-+++ CONFIG/src/config.c 2012-01-24 04:46:25.000000000 +0000
-@@ -1102,7 +1105,7 @@
- else if (!strcmp(sp0, "kern"))
- gcc3 = sp;
- else if (!strcmp(sp0, "pmake"))
-- *pmake = sp;
-+ *pmake = NewStringCopy(sp);
- else if (!strcmp(sp0, "flapack"))
- *flapack = sp;
- else if (!strcmp(sp0, "f77lib"))
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/atlas/, sci-libs/atlas/files/
@ 2012-07-16 23:21 Sebastien Fabbro
0 siblings, 0 replies; 9+ messages in thread
From: Sebastien Fabbro @ 2012-07-16 23:21 UTC (permalink / raw
To: gentoo-commits
commit: 0825f16ab3ec153827d9aadc60880028d81a9efe
Author: Olivier Huber <olivier.huber <AT> inria <DOT> fr>
AuthorDate: Thu Jun 7 22:58:37 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Jul 16 17:55:17 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0825f16a
Add support for x32 ABI
(Portage version: 2.2.0_alpha118/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/atlas/ChangeLog | 5 +
sci-libs/atlas/atlas-3.10.0.ebuild | 6 ++
sci-libs/atlas/files/atlas-3.10-x32-support.patch | 93 +++++++++++++++++++++
3 files changed, 104 insertions(+), 0 deletions(-)
diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
index e883743..edd02db 100644
--- a/sci-libs/atlas/ChangeLog
+++ b/sci-libs/atlas/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 16 Jul 2012; Olivier Huber <oli.huber@gmail.com>
+ +files/atlas-3.10-x32-support.patch, -files/3.9.76-x32.patch,
+ atlas-3.10.0.ebuild:
+ Add support for x32 ABI
+
*atlas-3.10.0 (10 Jul 2012)
10 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> +atlas-3.10.0.ebuild,
diff --git a/sci-libs/atlas/atlas-3.10.0.ebuild b/sci-libs/atlas/atlas-3.10.0.ebuild
index 72ed55b..ea605c3 100644
--- a/sci-libs/atlas/atlas-3.10.0.ebuild
+++ b/sci-libs/atlas/atlas-3.10.0.ebuild
@@ -46,6 +46,10 @@ pkg_setup() {
use fortran && fortran-2_pkg_setup
}
+src_prepare() {
+ epatch "${FILESDIR}"/atlas-3.10-x32-support.patch
+}
+
src_configure() {
# hack needed to trick the flaky gcc detection
local mycc="$(type -P $(tc-getCC))"
@@ -75,6 +79,8 @@ src_configure() {
myconf+=( "-b 64" )
elif [ ${ABI} = x86 ] || [ ${ABI} = ppc ] || [ ${ABI} = sparc32 ] ; then
myconf+=( "-b 32" )
+ elif [ ${ABI} = x32 ] ; then
+ myconf+=( "-b 48" )
else
myconf+=( "-b 64" )
fi
diff --git a/sci-libs/atlas/files/atlas-3.10-x32-support.patch b/sci-libs/atlas/files/atlas-3.10-x32-support.patch
new file mode 100644
index 0000000..82e6980
--- /dev/null
+++ b/sci-libs/atlas/files/atlas-3.10-x32-support.patch
@@ -0,0 +1,93 @@
+--- ATLAS/CONFIG/src/SpewMakeInc.c.orig 2012-05-24 00:56:27.000000000 +0200
++++ ATLAS/CONFIG/src/SpewMakeInc.c 2012-06-06 15:17:40.000000000 +0200
+@@ -370,7 +370,7 @@
+ }
+ *f2cdefs = fdefs;
+ *ecdefs = cdefs;
+- if (*ptrbits != 32 && *ptrbits != 64)
++ if (*ptrbits != 32 && *ptrbits != 64 && *ptrbits != 48)
+ *ptrbits = 0;
+ }
+ char *GetPtrbitsFlag(enum OSTYPE OS, enum MACHTYPE arch, int ptrbits,
+@@ -418,6 +418,8 @@
+ sp = "-m64";
+ else if (ptrbits == 32)
+ sp = "-m32";
++ else if (ptrbits == 48 && MachIsX86(arch))
++ sp = "-mx32";
+ }
+ return(sp);
+ }
+--- ATLAS/CONFIG/src/gnuccw.c.orig 2012-06-06 15:30:05.000000000 +0200
++++ ATLAS/CONFIG/src/gnuccw.c 2012-06-06 15:33:29.000000000 +0200
+@@ -363,7 +363,7 @@
+ * -m64/32 args get passed to comp, asm & linker
+ */
+ else if (at->len == 4 &&
+- (!strcmp(at->arg, "-m64") || !strcmp(at->arg, "-m32")))
++ (!strcmp(at->arg, "-m64") || !strcmp(at->arg, "-m32") || !strcmp(at->arg, "-mx32")))
+ {
+ if (at->arg[2] == '6')
+ *BITS = 64;
+--- ATLAS/CONFIG/src/gcc3p.c.orig 2012-06-06 15:29:38.000000000 +0200
++++ ATLAS/CONFIG/src/gcc3p.c 2012-06-06 15:31:17.000000000 +0200
+@@ -352,7 +352,7 @@
+ * -m64/32 args get passed to comp, asm & linker
+ */
+ else if (at->len == 4 &&
+- (!strcmp(at->arg, "-m64") || !strcmp(at->arg, "-m32")))
++ (!strcmp(at->arg, "-m64") || !strcmp(at->arg, "-m32") || !strcmp(at->arg, "-mx32")))
+ {
+ if (at->arg[2] == '6')
+ {
+--- ATLAS/CONFIG/src/gnuf90w.c.orig 2012-06-06 15:29:28.000000000 +0200
++++ ATLAS/CONFIG/src/gnuf90w.c 2012-06-06 15:30:36.000000000 +0200
+@@ -363,7 +363,7 @@
+ * -m64/32 args get passed to comp, asm & linker
+ */
+ else if (at->len == 4 &&
+- (!strcmp(at->arg, "-m64") || !strcmp(at->arg, "-m32")))
++ (!strcmp(at->arg, "-m64") || !strcmp(at->arg, "-m32") || !strcmp(at->arg, "-mx32")))
+ {
+ if (at->arg[2] == '6')
+ *BITS = 64;
+--- ATLAS/CONFIG/src/probe_comp.c.orig 2012-06-06 15:29:51.000000000 +0200
++++ ATLAS/CONFIG/src/probe_comp.c 2012-06-06 15:32:50.000000000 +0200
+@@ -614,6 +614,8 @@
+ sp = "-m64";
+ else if (ptrbits == 32)
+ sp = "-m32";
++ else if (ptrbits == 48)
++ sp = "-mx32";
+ }
+ return(sp);
+ }
+@@ -1691,7 +1693,7 @@
+ }
+ }
+ }
+- if (*ptrbits != 32 && *ptrbits != 64)
++ if (*ptrbits != 32 && *ptrbits != 64 && *ptrbits != 48)
+ *ptrbits = 0;
+ }
+
+--- ATLAS/CONFIG/src/config.c.orig 2012-06-06 15:59:53.000000000 +0200
++++ ATLAS/CONFIG/src/config.c 2012-06-06 16:00:07.000000000 +0200
+@@ -183,7 +183,7 @@
+ i = sprintf(ln, "make IRun_comp args=\"-v %d -o atlconf.txt -O %d -A %d -Si nof77 %d -V %d %s %s",
+ verb, OS, arch, nof77, vecext, targarg, flags);
+ free(flags);
+- if (ptrbits == 64 || ptrbits == 32)
++ if (ptrbits == 64 || ptrbits == 32 || ptrbits == 48)
+ {
+ sprintf(stmp, "-b %d", ptrbits);
+ ln = NewAppendedString(ln, stmp);
+@@ -1272,7 +1272,7 @@
+ }
+ *f2cdefs = fdefs;
+ *ecdefs = cdefs;
+- if (*ptrbits != 32 && *ptrbits != 64)
++ if (*ptrbits != 32 && *ptrbits != 64 && *ptrbits != 48)
+ *ptrbits = 0;
+ }
+
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/atlas/, sci-libs/atlas/files/
@ 2012-07-27 22:08 Sebastien Fabbro
0 siblings, 0 replies; 9+ messages in thread
From: Sebastien Fabbro @ 2012-07-27 22:08 UTC (permalink / raw
To: gentoo-commits
commit: f86c6651bf45231ea31273bd5e7419b326c4e770
Author: Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Fri Jul 27 22:07:55 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Jul 27 22:07:55 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f86c6651
sci-libs/atlas: added a generic flag for more generic architectures, and possibility for user to pass configure options via standard EXTRA_ECONF flags
(Portage version: 2.2.01.20796-prefix/git/Linux x86_64, unsigned Manifest commit)
---
sci-libs/atlas/ChangeLog | 6 ++++
sci-libs/atlas/atlas-3.10.0.ebuild | 25 +++++++++++++------
...upport.patch => atlas-3.10.0-x32-support.patch} | 0
sci-libs/atlas/metadata.xml | 4 +++
4 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
index edd02db..22ed8b7 100644
--- a/sci-libs/atlas/ChangeLog
+++ b/sci-libs/atlas/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 27 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+ +files/atlas-3.10.0-x32-support.patch, -files/atlas-3.10-x32-support.patch,
+ atlas-3.10.0.ebuild, metadata.xml:
+ sci-libs/atlas: added a generic flag for more generic architectures, and
+ possibility for user to pass configure options via standard EXTRA_ECONF flags
+
16 Jul 2012; Olivier Huber <oli.huber@gmail.com>
+files/atlas-3.10-x32-support.patch, -files/3.9.76-x32.patch,
atlas-3.10.0.ebuild:
diff --git a/sci-libs/atlas/atlas-3.10.0.ebuild b/sci-libs/atlas/atlas-3.10.0.ebuild
index ea605c3..e4f80bc 100644
--- a/sci-libs/atlas/atlas-3.10.0.ebuild
+++ b/sci-libs/atlas/atlas-3.10.0.ebuild
@@ -14,8 +14,8 @@ SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="fortran doc lapack static-libs threads"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="fortran doc generic lapack static-libs threads"
RDEPEND="fortran? ( virtual/fortran )"
DEPEND="${RDEPEND}
@@ -34,7 +34,7 @@ pkg_setup() {
ewarn "Run cpufreq-set -r -g performance as root"
die "${PN} needs all cpu set to performance"
fi
- cpu=$(( cpu + 1 ))
+ cpu=$((cpu + 1))
done
else
ewarn "Please make sure to disable CPU throttling completely"
@@ -47,7 +47,7 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/atlas-3.10-x32-support.patch
+ epatch "${FILESDIR}"/${P}-x32-support.patch
}
src_configure() {
@@ -69,7 +69,11 @@ src_configure() {
# OpenMP shown to decreased performance over POSIX threads
# (at least in 3.9.x, see atlas-dev mailing list)
if use threads; then
- myconf+=( "-t -1" "-Si omp 0" )
+ if use generic; then # 2 threads is most generic
+ myconf+=( "-t 2" "-Si omp 0" )
+ else
+ myconf+=( "-t -1" "-Si omp 0" )
+ fi
else
myconf+=( "-t 0" "-Si omp 0" )
fi
@@ -107,6 +111,11 @@ src_configure() {
else
myconf+=( "-Si latune 0" "--nof77" )
fi
+ # generic stuff found by make make xprint_enums in atlas build dir
+ # basically assuming sse2+sse1 and 2 threads max
+ use generic && use x86 && myconf+=( "-V 384 -A 13")
+ use generic && use amd64 && myconf+=( "-V 384 -A 24")
+
local confdir="${S}_${1}"; shift
myconf+=( $@ )
mkdir "${confdir}" && cd "${confdir}"
@@ -115,8 +124,8 @@ src_configure() {
"${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
}
- atlas_configure shared "-Fa alg -fPIC"
- use static-libs && atlas_configure static
+ atlas_configure shared "-Fa alg -fPIC" ${EXTRA_ECONF}
+ use static-libs && atlas_configure static ${EXTRA_ECONF}
}
src_compile() {
@@ -267,5 +276,5 @@ src_install() {
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
+ use doc && use fortran && use lapack && dodoc *lapack*pdf
}
diff --git a/sci-libs/atlas/files/atlas-3.10-x32-support.patch b/sci-libs/atlas/files/atlas-3.10.0-x32-support.patch
similarity index 100%
rename from sci-libs/atlas/files/atlas-3.10-x32-support.patch
rename to sci-libs/atlas/files/atlas-3.10.0-x32-support.patch
diff --git a/sci-libs/atlas/metadata.xml b/sci-libs/atlas/metadata.xml
index 94634e4..4aeff0d 100644
--- a/sci-libs/atlas/metadata.xml
+++ b/sci-libs/atlas/metadata.xml
@@ -10,4 +10,8 @@
a subset of the linear algebra routine LAPACK library or the full
LAPACK using the reference LAPACK from Netlib.
</longdescription>
+<use>
+<flag name='generic'>Build atlas assuming a fairly generic
+architecture (sse2 for x86, core2 for amd64)</flag>
+</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/atlas/, sci-libs/atlas/files/
@ 2012-12-13 0:10 Sebastien Fabbro
0 siblings, 0 replies; 9+ messages in thread
From: Sebastien Fabbro @ 2012-12-13 0:10 UTC (permalink / raw
To: gentoo-commits
commit: 9372e18f1a9e1c94db4e250b2e0733477fede7b2
Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 12 22:54:58 2012 +0000
Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Dec 12 22:54:58 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=9372e18f
sci-libs/atlas: Update for lapack-3.4.2
Package-Manager: portage-2.2.01.21418-prefix
---
sci-libs/atlas/ChangeLog | 4 +
sci-libs/atlas/atlas-3.10.0.ebuild | 6 +-
sci-libs/atlas/atlas-3.8.4.ebuild | 281 ------------------------
sci-libs/atlas/files/3.9.39-bfr-overflow.patch | 72 ------
sci-libs/atlas/metadata.xml | 3 +-
5 files changed, 9 insertions(+), 357 deletions(-)
diff --git a/sci-libs/atlas/ChangeLog b/sci-libs/atlas/ChangeLog
index 22ed8b7..22266c7 100644
--- a/sci-libs/atlas/ChangeLog
+++ b/sci-libs/atlas/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 12 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> -atlas-3.8.4.ebuild,
+ -files/3.9.39-bfr-overflow.patch, atlas-3.10.0.ebuild, metadata.xml:
+ sci-libs/atlas: Update for lapack-3.4.2
+
27 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org>
+files/atlas-3.10.0-x32-support.patch, -files/atlas-3.10-x32-support.patch,
atlas-3.10.0.ebuild, metadata.xml:
diff --git a/sci-libs/atlas/atlas-3.10.0.ebuild b/sci-libs/atlas/atlas-3.10.0.ebuild
index e4f80bc..2d9a170 100644
--- a/sci-libs/atlas/atlas-3.10.0.ebuild
+++ b/sci-libs/atlas/atlas-3.10.0.ebuild
@@ -3,9 +3,11 @@
# $Header: $
EAPI=4
+
+FORTRAN_NEEDED=fortran
inherit eutils toolchain-funcs fortran-2 versionator alternatives-2 multilib
-LAPACKP=lapack-3.4.1.tgz
+LAPACKP=lapack-3.4.2.tgz
DESCRIPTION="Automatically Tuned Linear Algebra Software"
HOMEPAGE="http://math-atlas.sourceforge.net/"
@@ -17,7 +19,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="fortran doc generic lapack static-libs threads"
-RDEPEND="fortran? ( virtual/fortran )"
+RDEPEND=""
DEPEND="${RDEPEND}
!prefix? ( sys-power/cpufrequtils )"
diff --git a/sci-libs/atlas/atlas-3.8.4.ebuild b/sci-libs/atlas/atlas-3.8.4.ebuild
deleted file mode 100644
index b2feb7f..0000000
--- a/sci-libs/atlas/atlas-3.8.4.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils toolchain-funcs versionator alternatives-2 multilib
-
-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 ~amd64-linux"
-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"
- 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
-}
diff --git a/sci-libs/atlas/files/3.9.39-bfr-overflow.patch b/sci-libs/atlas/files/3.9.39-bfr-overflow.patch
deleted file mode 100644
index a4ae52a..0000000
--- a/sci-libs/atlas/files/3.9.39-bfr-overflow.patch
+++ /dev/null
@@ -1,72 +0,0 @@
- ATLAS/tune/blas/level1/axpysrch.c | 2 +-
- ATLAS/tune/blas/level1/copysrch.c | 2 +-
- ATLAS/tune/blas/level1/iamaxsrch.c | 2 +-
- ATLAS/tune/blas/level1/scalsrch.c | 2 +-
- ATLAS/tune/blas/level1/swapsrch.c | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/ATLAS/tune/blas/level1/axpysrch.c b/ATLAS/tune/blas/level1/axpysrch.c
-index 48bd756..f7f7845 100644
---- a/ATLAS/tune/blas/level1/axpysrch.c
-+++ b/ATLAS/tune/blas/level1/axpysrch.c
-@@ -159,7 +159,7 @@ FILENODE *ReadFile(char pre)
- {
- FILE *fpin;
- FILENODE *fbase, *fn, *fp=NULL;
-- char ln[512], rout[256], auth[256], cc[256], ccflags[256];
-+ char ln[512], rout[256], auth[256], cc[256], ccflags[512];
- char *pcc, *pccflags;
- int i, n, ID, alpha, beta, incX, incY;
-
-diff --git a/ATLAS/tune/blas/level1/copysrch.c b/ATLAS/tune/blas/level1/copysrch.c
-index 3a9fcfc..736f501 100644
---- a/ATLAS/tune/blas/level1/copysrch.c
-+++ b/ATLAS/tune/blas/level1/copysrch.c
-@@ -159,7 +159,7 @@ FILENODE *ReadFile(char pre)
- {
- FILE *fpin;
- FILENODE *fbase, *fn, *fp=NULL;
-- char ln[512], rout[256], auth[256], cc[256], ccflags[256];
-+ char ln[512], rout[256], auth[256], cc[256], ccflags[512];
- char *pcc, *pccflags;
- int i, n, ID, alpha, beta, incX, incY;
-
-diff --git a/ATLAS/tune/blas/level1/iamaxsrch.c b/ATLAS/tune/blas/level1/iamaxsrch.c
-index e9e766a..91b3acd 100644
---- a/ATLAS/tune/blas/level1/iamaxsrch.c
-+++ b/ATLAS/tune/blas/level1/iamaxsrch.c
-@@ -159,7 +159,7 @@ FILENODE *ReadFile(char pre)
- {
- FILE *fpin;
- FILENODE *fbase, *fn, *fp=NULL;
-- char ln[512], rout[256], auth[256], cc[256], ccflags[256];
-+ char ln[512], rout[256], auth[256], cc[256], ccflags[512];
- char *pcc, *pccflags;
- int i, n, ID, alpha, beta, incX, incY;
-
-diff --git a/ATLAS/tune/blas/level1/scalsrch.c b/ATLAS/tune/blas/level1/scalsrch.c
-index 48be97e..35d724d 100644
---- a/ATLAS/tune/blas/level1/scalsrch.c
-+++ b/ATLAS/tune/blas/level1/scalsrch.c
-@@ -159,7 +159,7 @@ FILENODE *ReadFile(char pre)
- {
- FILE *fpin;
- FILENODE *fbase, *fn, *fp=NULL;
-- char ln[512], rout[256], auth[256], cc[256], ccflags[256];
-+ char ln[512], rout[256], auth[256], cc[256], ccflags[512];
- char *pcc, *pccflags;
- int i, n, ID, alpha, beta, incX, incY;
-
-diff --git a/ATLAS/tune/blas/level1/swapsrch.c b/ATLAS/tune/blas/level1/swapsrch.c
-index 776d2d7..5281ae5 100644
---- a/ATLAS/tune/blas/level1/swapsrch.c
-+++ b/ATLAS/tune/blas/level1/swapsrch.c
-@@ -159,7 +159,7 @@ FILENODE *ReadFile(char pre)
- {
- FILE *fpin;
- FILENODE *fbase, *fn, *fp=NULL;
-- char ln[512], rout[256], auth[256], cc[256], ccflags[256];
-+ char ln[512], rout[256], auth[256], cc[256], ccflags[512];
- char *pcc, *pccflags;
- int i, n, ID, alpha, beta, incX, incY;
-
diff --git a/sci-libs/atlas/metadata.xml b/sci-libs/atlas/metadata.xml
index 4aeff0d..b4b8088 100644
--- a/sci-libs/atlas/metadata.xml
+++ b/sci-libs/atlas/metadata.xml
@@ -11,7 +11,6 @@
LAPACK using the reference LAPACK from Netlib.
</longdescription>
<use>
-<flag name='generic'>Build atlas assuming a fairly generic
-architecture (sse2 for x86, core2 for amd64)</flag>
+ <flag name='generic'>Build atlas assuming a fairly generic architecture (sse2 for x86, core2 for amd64)</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/atlas/, sci-libs/atlas/files/
@ 2015-12-03 18:56 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-12-03 18:56 UTC (permalink / raw
To: gentoo-commits
commit: 981bdfbb5b643409f36ae16ff4400e847acb0e61
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 3 18:56:15 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Dec 3 18:56:15 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=981bdfbb
sci-libs/atlas: Version Bump
Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
sci-libs/atlas/atlas-3.10.1-r2.ebuild | 7 +-
...{atlas-3.10.1-r1.ebuild => atlas-3.10.2.ebuild} | 13 +-
...atlas-3.10.1-r1.ebuild => atlas-3.11.38.ebuild} | 70 ++++----
sci-libs/atlas/files/format-security.patch | 198 +++++++++++++++++++++
sci-libs/atlas/metadata.xml | 1 +
5 files changed, 244 insertions(+), 45 deletions(-)
diff --git a/sci-libs/atlas/atlas-3.10.1-r2.ebuild b/sci-libs/atlas/atlas-3.10.1-r2.ebuild
index 6907b93..979f7b4 100644
--- a/sci-libs/atlas/atlas-3.10.1-r2.ebuild
+++ b/sci-libs/atlas/atlas-3.10.1-r2.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
FORTRAN_NEEDED=fortran
-inherit eutils toolchain-funcs fortran-2 versionator alternatives-2 multilib
+
+inherit alternatives-2 eutils fortran-2 multilib toolchain-funcs versionator
LAPACKP=lapack-3.5.0.tgz
@@ -17,7 +18,7 @@ SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="fortran doc generic lapack static-libs threads"
+IUSE="doc fortran generic lapack static-libs threads"
RDEPEND=""
DEPEND="${RDEPEND}"
diff --git a/sci-libs/atlas/atlas-3.10.1-r1.ebuild b/sci-libs/atlas/atlas-3.10.2.ebuild
similarity index 95%
copy from sci-libs/atlas/atlas-3.10.1-r1.ebuild
copy to sci-libs/atlas/atlas-3.10.2.ebuild
index 9f9bb29..83e3fd0 100644
--- a/sci-libs/atlas/atlas-3.10.1-r1.ebuild
+++ b/sci-libs/atlas/atlas-3.10.2.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
FORTRAN_NEEDED=fortran
-inherit eutils toolchain-funcs fortran-2 versionator alternatives-2 multilib
-LAPACKP=lapack-3.4.2.tgz
+inherit alternatives-2 eutils fortran-2 multilib toolchain-funcs versionator
+
+LAPACKP=lapack-3.6.0.tgz
DESCRIPTION="Automatically Tuned Linear Algebra Software"
HOMEPAGE="http://math-atlas.sourceforge.net/"
@@ -17,7 +18,7 @@ SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="fortran doc generic lapack static-libs threads"
+IUSE="doc fortran generic lapack static-libs threads"
RDEPEND=""
DEPEND="${RDEPEND}"
@@ -38,7 +39,9 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.10.0-x32-support.patch
+ epatch \
+ "${FILESDIR}"/${PN}-3.10.0-x32-support.patch \
+ "${FILESDIR}"/${P1}format-security.patch
}
src_configure() {
diff --git a/sci-libs/atlas/atlas-3.10.1-r1.ebuild b/sci-libs/atlas/atlas-3.11.38.ebuild
similarity index 85%
rename from sci-libs/atlas/atlas-3.10.1-r1.ebuild
rename to sci-libs/atlas/atlas-3.11.38.ebuild
index 9f9bb29..e0e41ec 100644
--- a/sci-libs/atlas/atlas-3.10.1-r1.ebuild
+++ b/sci-libs/atlas/atlas-3.11.38.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
FORTRAN_NEEDED=fortran
-inherit eutils toolchain-funcs fortran-2 versionator alternatives-2 multilib
-LAPACKP=lapack-3.4.2.tgz
+inherit alternatives-2 eutils fortran-2 multilib numeric toolchain-funcs versionator
+
+LAPACKP=lapack-3.6.0.tgz
DESCRIPTION="Automatically Tuned Linear Algebra Software"
HOMEPAGE="http://math-atlas.sourceforge.net/"
@@ -17,7 +18,7 @@ SRC_URI="mirror://sourceforge/math-atlas/${PN}${PV}.tar.bz2
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="fortran doc generic lapack static-libs threads"
+IUSE="doc fortran generic ifko lapack static-libs threads"
RDEPEND=""
DEPEND="${RDEPEND}"
@@ -34,13 +35,11 @@ pkg_setup() {
fi
fi
done
+ [[ -e /sys/devices/system/cpu/intel_pstate ]] \
+ && die "Intel P-State driver detected. Please reboot with 'intel_pstate=disable' in your cmdline"
use fortran && fortran-2_pkg_setup
}
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.10.0-x32-support.patch
-}
-
src_configure() {
# hack needed to trick the flaky gcc detection
local mycc="$(type -P $(tc-getCC))"
@@ -106,8 +105,9 @@ src_configure() {
use generic && use amd64 && myconf+=( "-V 384 -A 24")
local confdir="${S}_${1}"; shift
+ myconf+=( $(usex ifko "--use-ifko" "") )
myconf+=( $@ )
- mkdir "${confdir}" && cd "${confdir}"
+ mkdir "${confdir}" && cd "${confdir}" || die
# for debugging
echo ${myconf[@]} > myconf.out
"${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
@@ -119,13 +119,13 @@ src_configure() {
src_compile() {
atlas_compile() {
- pushd "${S}_${1}" > /dev/null
+ pushd "${S}_${1}" > /dev/null || die
# atlas does its own parallel builds
emake -j1 build
- cd lib
+ cd lib || die
emake libclapack.a
[[ -e libptcblas.a ]] && emake libptclapack.a
- popd > /dev/null
+ popd > /dev/null || die
}
atlas_compile shared
@@ -133,7 +133,7 @@ src_compile() {
}
src_test() {
- cd "${S}_shared"
+ cd "${S}_shared" || die
emake -j1 check time
}
@@ -149,9 +149,8 @@ atlas_install_libs() {
-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
+ popd > /dev/null || die
use static-libs && dolib.a "${S}_static"/lib/${libname}.a
}
@@ -160,31 +159,28 @@ atlas_install_libs() {
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} $@
- Libs.private: -L\${libdir} -latlas -lm ${PTLIBS}
- Cflags: -I\${includedir}/${PN}
- ${PCREQ}
- EOF
- insinto /usr/$(get_libdir)/pkgconfig
- doins ${pcname}.pc
+ local extra=()
+ [[ ${PCREQ} ]] && extra+=( --requires "${PCREQ}" )
+ create_pkgconfig \
+ --name "${pcname}" \
+ --description "${PN} ${pcname}" \
+ --libs "-L\${libdir} -l${libname} $@" \
+ --libs-private "-L\${libdir} -latlas -lm ${PTLIBS}" \
+ --cflags "-I\${includedir}/${PN}" \
+ "${extra[@]}" \
+ ${pcname}
}
src_install() {
- cd "${S}_shared/lib"
+ cd "${S}_shared/lib" || die
# 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
+ mv lib{,atl}${l}.a || die
+ if use static-libs; then
+ mv "${S}"_static/lib/lib{,atl}${l}.a || die
+ fi
fi
done
@@ -210,7 +206,7 @@ src_install() {
fi
if use lapack; then
- PCREQ="Requires: cblas"
+ PCREQ="cblas"
# clapack
atlas_install_libs libatlclapack.a -lm -L. -latlas -latlcblas
atlas_install_pc atlclapack atlas-clapack
@@ -240,7 +236,7 @@ src_install() {
fi
if use lapack; then
- PCREQ="Requires: blas cblas"
+ PCREQ="blas cblas"
# lapack
atlas_install_libs libatllapack.a \
-lm -L. -latlas -latlcblas -lf77blas
@@ -258,11 +254,11 @@ src_install() {
fi
fi
- cd "${S}"
+ cd "${S}" || die
insinto /usr/include/${PN}
doins include/*.h
- cd "${S}/doc"
+ cd "${S}/doc" || die
dodoc INDEX.txt AtlasCredits.txt ChangeLog
use doc && dodoc atlas*pdf cblas.pdf cblasqref.pdf
use doc && use fortran && dodoc f77blas*pdf
diff --git a/sci-libs/atlas/files/format-security.patch b/sci-libs/atlas/files/format-security.patch
new file mode 100644
index 0000000..f3f45d7
--- /dev/null
+++ b/sci-libs/atlas/files/format-security.patch
@@ -0,0 +1,198 @@
+ bin/atlas_install.c | 46 +++++++++++++++++++++++-----------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/bin/atlas_install.c b/bin/atlas_install.c
+index 2753cbf..21b716d 100644
+--- a/bin/atlas_install.c
++++ b/bin/atlas_install.c
+@@ -483,9 +483,9 @@ void PrintStartStop(FILE *fp0, FILE *fp1, int nspc, int START, int sec,
+ fprintf(fp1, "\n\n");
+ }
+ if (fp0)
+- fprintf(fp0, ln);
++ fprintf(fp0, "%s", ln);
+ if (fp1)
+- fprintf(fp1, ln);
++ fprintf(fp1, "%s", ln);
+ }
+
+ int LnIsCont(char *ln)
+@@ -776,11 +776,11 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ if (DefInstall)
+ {
+ sprintf(ln, "%s IRunMMDef pre=%c %s %s\n", fmake, pre, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2);
+ }
+ sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2);
+ PrintBanner(ln2, 0, 2, ip+1, 1);
+ }
+@@ -836,7 +836,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ if (!FileExists(fnam))
+ {
+ sprintf(ln, "%s %s pre=%c %s %s", fmake, fnam, pre, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2);
+ }
+ fp = fopen(fnam, "r");
+@@ -854,7 +854,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ {
+ sprintf(ln, "%s %s pre=%c nb=%d %s %s",
+ fmake, fnam, pre, ncnb, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2);
+ }
+ GetInstLogFile(fnam, pre, &muladd, &pf, &lat, &nb, &mu, &nu, &ku,
+@@ -881,7 +881,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ }
+
+ sprintf(ln, "%s MMinstall pre=%c %s %s\n", fmake, pre, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2);
+
+ fprintf(fpsum, "\n");
+@@ -896,7 +896,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ PrintBanner(ln2, 1, 2, ip+1, 2);
+ sprintf(ln, "%s INSTALL_LOG/atlas_cacheedge.h pre=%c %s %s\n",
+ fmake, pre, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "CACHEEDGE DETECTION", ln2);
+ PrintBanner(ln2, 0, 2, ip+1, 2);
+ }
+@@ -922,7 +922,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ {
+ sprintf(ln, "%s %s pre=%c %s %s\n",
+ fmake, ln3, pre, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "CACHEEDGE DETECTION", ln2);
+ }
+ fp = fopen(ln3, "r");
+@@ -955,7 +955,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ "\n\n STAGE 2-%d-3: COPY/NO-COPY CROSSOVER DETECTION\n", ip+1);
+
+ sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "COPY/NO-COPY CROSSOVER DETECTION", ln2);
+ PrintBanner(ln2, 0, 2, ip+1, 3);
+ fprintf(stdout, " done.\n");
+@@ -970,17 +970,17 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ {
+ sprintf(ln, "%s INSTALL_LOG/atlas_%ctrsmXover.h pre=%c %s %s\n",
+ fmake, pre, pre, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "L3BLAS TUNING", ln2);
+ }
+ else
+ {
+ sprintf(ln, "%s Il3lib pre=%c %s %s\n", fmake, pre, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "L3BLAS TUNING", ln2);
+ }
+ sprintf(ln, "%s %ccblaslib %s %s\n", fmake, pre, redir, ln2); /* cblas */
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "L3BLAS TUNING", ln2);
+ PrintBanner(ln2, 0, 2, ip+1, 5);
+ PrintStartStop(stdout, fpsum, 3, 0, 2, ip+1, 4, "L3BLAS TUNE");
+@@ -993,7 +993,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ sprintf(ln2, "INSTALL_LOG/%cMVNTUNE.LOG", pre);
+ PrintBanner(ln2, 1, 2, ip+1, 7);
+ sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "MVNTUNE", ln2);
+ ATL_Cassert(FileIsThere(fnam), "MVNTUNE", ln2);
+ PrintBanner(ln2, 0, 2, ip+1, 7);
+@@ -1026,7 +1026,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ sprintf(ln2, "INSTALL_LOG/%cMVTTUNE.LOG", pre);
+ PrintBanner(ln2, 1, 2, ip+1, 7);
+ sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "MVTTUNE", ln2);
+ ATL_Cassert(FileIsThere(fnam), "MVTTUNE", ln2);
+ PrintBanner(ln2, 0, 2, ip+1, 7);
+@@ -1061,7 +1061,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ sprintf(ln2, "INSTALL_LOG/%cR1TUNE.LOG", pre);
+ PrintBanner(ln2, 1, 2, ip+1, 7);
+ sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "R1TUNE", ln2);
+ ATL_Cassert(FileIsThere(fnam), "R1TUNE", ln2);
+ PrintBanner(ln2, 0, 2, ip+1, 7);
+@@ -1099,7 +1099,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ sprintf(ln2, "INSTALL_LOG/LIBBUILD.LOG");
+ PrintBanner(ln2, 1, 3, 1, 1);
+ sprintf(ln, "%s IBuildLibs %s %s\n", fmake, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "LIBRARY BUILD", ln2);
+ ATL_Cassert(FileIsThere(fnam), "LIBRARY BUILD", ln2);
+ PrintBanner(ln2, 0, 3, 1, 1);
+@@ -1110,7 +1110,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ PrintBanner(ln2, 1, 4, 1, 1);
+ PrintStartStop(stdout, fpsum, 3, 1, 4, 1, 1, "TRSM TUNE");
+ sprintf(ln, "%s IPostTune %s %s\n", fmake, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "POST-BUILD TUNE", ln2);
+ PrintStartStop(stdout, fpsum, 3, 0, 4, 1, 0, NULL);
+ ATL_Cassert(FileIsThere(fnam), "POST-BUILD TUNE", ln2);
+@@ -1121,7 +1121,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ sprintf(ln2, "INSTALL_LOG/PTTUNE.LOG");
+ PrintBanner(ln2, 1, 4, 2, 0);
+ sprintf(ln, "%s IPTtune %s %s\n", fmake, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "THREADING TUNE", ln2);
+ PrintStartStop(stdout, fpsum, 3, 0, 4, 2, 0, "THREADING TUNE");
+
+@@ -1129,7 +1129,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ sprintf(ln2, "INSTALL_LOG/LIBPTBUILD.LOG");
+ PrintBanner(ln2, 1, 4, 2, 1);
+ sprintf(ln, "%s IBuildPtlibs %s %s\n", fmake, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "PTLIBRARY BUILD", ln2);
+ PrintBanner(ln2, 0, 4, 2, 1);
+ PrintStartStop(stdout, fpsum, 3, 0, 4, 2, 1, "THREADING BUILD");
+@@ -1144,7 +1144,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ PrintStartStop(stdout, fpsum, 6, 1, 4, 3, ip+1, ln2);
+ sprintf(ln2, "INSTALL_LOG/%cLATUNE.LOG", pre);
+ PrintBanner(ln2, 1, 4, 3, ip+1);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ sprintf(ln, "%s ILATune pre=%c %s %s\n", fmake, pre, redir, ln2);
+ ATL_Cassert(system(ln)==0, "LAPACK TUNE", ln2);
+ PrintStartStop(stdout, fpsum, 6, 0, 4, 3, ip+1, NULL);
+@@ -1162,7 +1162,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ #else
+ sprintf(ln, "%s IBuildLibs %s %s\n", fmake, redir, ln2);
+ #endif
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "STATIC LIBRARY UPDATE", ln2);
+ PrintBanner(ln2, 0, 5, 1, 1);
+ PrintStartStop(stdout, fpsum, 3, 0, 5, 1, 0, "FINAL STATIC LIBRARY UPDATE");
+@@ -1172,7 +1172,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
+ sprintf(ln2, "INSTALL_LOG/LIBDYBUILD.LOG");
+ PrintBanner(ln2, 1, 5, 2, 1);
+ sprintf(ln, "%s IBuildDyLibs %s %s\n", fmake, redir, ln2);
+- fprintf(stdout, ln);
++ fprintf(stdout, "%s", ln);
+ ATL_Cassert(system(ln)==0, "DYLIBRARY BUILD", ln2);
+ PrintBanner(ln2, 0, 5, 2, 1);
+ PrintStartStop(stdout, fpsum, 3, 0, 5, 2, 0, NULL);
diff --git a/sci-libs/atlas/metadata.xml b/sci-libs/atlas/metadata.xml
index 31d8b74..77d74d9 100644
--- a/sci-libs/atlas/metadata.xml
+++ b/sci-libs/atlas/metadata.xml
@@ -12,6 +12,7 @@
</longdescription>
<use>
<flag name="generic">Build atlas assuming a fairly generic architecture (sse2 for x86, core2 for amd64)</flag>
+ <flag name="ifko">Use iFKO to improve ATLAS performance (ATTENTION!!! Increases builtime enormously)</flag>
</use>
<upstream>
<remote-id type="sourceforge">math-atlas</remote-id>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/atlas/, sci-libs/atlas/files/
@ 2017-06-27 9:49 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2017-06-27 9:49 UTC (permalink / raw
To: gentoo-commits
commit: 248cdac8246c9b43b970bca62e4ea70808c47cb1
Author: Gergely Nagy <ngg <AT> tresorit <DOT> com>
AuthorDate: Mon Jun 26 10:49:26 2017 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 09:49:39 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=248cdac8
sci-libs/atlas: version bump to 3.11.39
Patch from upstream is required to build the shared library:
https://sourceforge.net/p/math-atlas/bugs/260/
Closes: https://github.com/gentoo/sci/pull/794
sci-libs/atlas/atlas-3.11.39.ebuild | 285 +++++++++++++++++++++
.../atlas/files/atlas-3.11.39-dolastcomp.patch | 13 +
2 files changed, 298 insertions(+)
diff --git a/sci-libs/atlas/atlas-3.11.39.ebuild b/sci-libs/atlas/atlas-3.11.39.ebuild
new file mode 100644
index 000000000..f4b65140c
--- /dev/null
+++ b/sci-libs/atlas/atlas-3.11.39.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED=fortran
+
+inherit alternatives-2 eutils fortran-2 linux-info multilib numeric toolchain-funcs versionator
+
+LAPACKP=lapack-3.7.0.tgz
+
+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} ) )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+deprecated doc +fortran generic ifko +lapack static-libs threads"
+
+REQUIRED_USE="
+ deprecated? ( lapack )
+ lapack? ( fortran )"
+
+S="${WORKDIR}/ATLAS"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-dolastcomp.patch
+)
+
+pkg_setup() {
+ local _cpufreq
+ for _cpufreq in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
+ if [ -f ${_cpufreq} ]; then
+ if ! grep -q performance ${_cpufreq}; then
+ echo 2> /dev/null performance > ${_cpufreq} || \
+ die "${PN} needs all cpu set to performance"
+ fi
+ fi
+ done
+ [[ -e /sys/devices/system/cpu/intel_pstate ]] \
+ && die "Intel P-State driver detected. Please reboot with 'intel_pstate=disable' in your cmdline"
+ use fortran && fortran-2_pkg_setup
+ CONFIG_CHECK="
+ !~X86_P4_CLOCKMOD
+ !~X86_INTEL_PSTATE
+ "
+ ERROR_KERNEL_X86_P4_CLOCKMOD="P4 Clockmod frequency scaling influences tuning and needs to be disabled at compile time."
+ ERROR_KERNEL_X86_INTEL_PSTATE="Intel Pstate frequency scaling influences tuning and needs to be disabled at compile time."
+ linux-info_pkg_setup
+}
+
+src_configure() {
+ # hack needed to trick the flaky gcc detection
+ local mycc="$(type -P $(tc-getCC))"
+ [[ ${mycc} == *gcc* ]] && mycc=gcc
+ atlas_configure() {
+ local myconf=(
+ --prefix="${ED}/usr"
+ --libdir="${ED}/usr/$(get_libdir)"
+ --incdir="${ED}/usr/include"
+ --cc="$(tc-getCC)"
+ "-D c -DWALL"
+ "-C acg '${mycc}'"
+ "-F acg '${CFLAGS}'"
+ "-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
+ )
+
+ # OpenMP shown to decreased performance over POSIX threads
+ # (at least in 3.9.x, see atlas-dev mailing list)
+ if use threads; then
+ if use generic; then # 2 threads is most generic
+ myconf+=( "-t 2" "-Si omp 0" )
+ else
+ myconf+=( "-t -1" "-Si omp 0" )
+ fi
+ 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" )
+ elif [ ${ABI} = x32 ] ; then
+ myconf+=( "-b 48" )
+ else
+ myconf+=( "-b 64" )
+ fi
+ elif use ppc || use x86; then
+ myconf+=( "-b 32" )
+ elif use ia64; then
+ myconf+=( "-b 64" )
+ fi
+ if use fortran; then
+ myconf+=(
+ "-C if '$(type -P $(tc-getFC))'"
+ "-F if '${FFLAGS}'"
+ )
+ if use lapack; then
+ myconf+=(
+ "-Si latune 1"
+ "--with-netlib-lapack-tarfile=${DISTDIR}/${LAPACKP}"
+ )
+ else
+ myconf+=( "-Si latune 0" )
+ fi
+ else
+ myconf+=( "-Si latune 0" "--nof77" )
+ fi
+ # generic stuff found by make make xprint_enums in atlas build dir
+ # basically assuming sse2+sse1 and 2 threads max
+ use generic && use x86 && myconf+=( "-V 384 -A 13")
+ use generic && use amd64 && myconf+=( "-V 384 -A 24")
+
+ local confdir="${S}_${1}"; shift
+ myconf+=( $(usex ifko "--use-ifko" "") )
+ myconf+=( $@ )
+ mkdir "${confdir}" && cd "${confdir}" || die
+ # for debugging
+ echo ${myconf[@]} > myconf.out
+ "${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
+
+ if use deprecated; then
+ echo "BUILD_DEPRECATED=1" >> src/lapack/reference/make.inc.example || die
+ fi
+ }
+
+ atlas_configure shared "-Fa alg -fPIC" ${EXTRA_ECONF}
+ use static-libs && atlas_configure static ${EXTRA_ECONF}
+}
+
+src_compile() {
+ atlas_compile() {
+ pushd "${S}_${1}" > /dev/null || die
+ # atlas does its own parallel builds
+ emake -j1 build
+ cd lib || die
+ emake libclapack.a
+ [[ -e libptcblas.a ]] && emake libptclapack.a
+ popd > /dev/null || die
+ }
+
+ atlas_compile shared
+ use static-libs && atlas_compile static
+}
+
+src_test() {
+ cd "${S}_shared" || die
+ emake -j1 check time
+}
+
+# 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)
+ local _cmd
+ shift
+ pushd "${S}_shared"/lib > /dev/null
+ _cmd="${LINK:-$(tc-getCC)}"
+ _cmd+=" ${LDFLAGS} -shared -Wl,--no-undefined -Wl,-soname=${soname}"
+ _cmd+=" -Wl,--whole-archive ${libname}.a -Wl,--no-whole-archive"
+ _cmd+=" $@ -o ${soname}"
+ einfo "${_cmd}"
+ ${_cmd} || die "Creating ${soname} failed"
+ dolib.so ${soname}
+ dosym ${soname} /usr/$(get_libdir)/${soname%.*}
+ popd > /dev/null || die
+ 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
+ local extra=()
+ [[ ${PCREQ} ]] && extra+=( --requires "${PCREQ}" )
+ create_pkgconfig \
+ --name "${pcname}" \
+ --description "${PN} ${pcname}" \
+ --libs "-L\${libdir} -l${libname} $@" \
+ --libs-private "-L\${libdir} -latlas -lm ${PTLIBS}" \
+ --cflags "-I\${includedir}/${PN}" \
+ "${extra[@]}" \
+ ${pcname}
+}
+
+src_install() {
+ cd "${S}_shared/lib" || die
+ # 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 || die
+ if use static-libs; then
+ mv "${S}"_static/lib/lib{,atl}${l}.a || die
+ fi
+ fi
+ done
+
+ [[ -e libptcblas.a ]] && PTLIBS="-lpthread"
+
+ # atlas
+ atlas_install_libs libatlas.a -lm ${PTLIBS}
+
+ # cblas
+ atlas_install_libs libatlcblas.a -L. -latlas -lm
+ atlas_install_pc atlcblas atlas-cblas
+ 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 -L. -latlas -lm ${PTLIBS}
+ atlas_install_pc ptcblas atlas-cblas-threads
+ 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="cblas"
+ # clapack
+ atlas_install_libs libatlclapack.a -L. -latlcblas -latlas -lm
+ atlas_install_pc atlclapack atlas-clapack
+
+ # clapack threaded
+ if [[ -e libptclapack.a ]]; then
+ atlas_install_libs libptclapack.a -L. -lptcblas -latlas -lm ${PTLIBS}
+ atlas_install_pc ptclapack atlas-clapack-threads
+ fi
+ fi
+
+ if use fortran; then
+ LINK=$(tc-getF77) PCREQ=
+
+ # blas
+ atlas_install_libs libf77blas.a -L. -latlas -lm
+ atlas_install_pc f77blas atlas-blas
+ 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 -L. -latlas -lm ${PTLIBS}
+ atlas_install_pc ptf77blas atlas-blas-threads
+ alternatives_for blas atlas-threads 0 \
+ /usr/$(get_libdir)/pkgconfig/blas.pc atlas-blas-threads.pc
+ fi
+
+ if use lapack; then
+ PCREQ="blas cblas"
+ # lapack
+ atlas_install_libs libatllapack.a \
+ -L. -latlcblas -lf77blas -latlas -lm
+ atlas_install_pc atllapack atlas-lapack
+ 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 \
+ -L. -lptcblas -lptf77blas -latlas -lm ${PTLIBS}
+ atlas_install_pc ptlapack atlas-lapack-threads
+ alternatives_for lapack atlas-threads 0 \
+ /usr/$(get_libdir)/pkgconfig/lapack.pc atlas-lapack-threads.pc
+ fi
+ fi
+ fi
+
+ cd "${S}" || die
+ insinto /usr/include/${PN}
+ doins include/*.h
+
+ cd "${S}/doc" || die
+ 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
+}
diff --git a/sci-libs/atlas/files/atlas-3.11.39-dolastcomp.patch b/sci-libs/atlas/files/atlas-3.11.39-dolastcomp.patch
new file mode 100644
index 000000000..3cd554cf4
--- /dev/null
+++ b/sci-libs/atlas/files/atlas-3.11.39-dolastcomp.patch
@@ -0,0 +1,13 @@
+diff --git a/src/threads/blas/level3/ATL_tammm_G.c b/src/threads/blas/level3/ATL_tammm_G.c
+index a43a08b..77c78f4 100644
+--- a/src/threads/blas/level3/ATL_tammm_G.c
++++ b/src/threads/blas/level3/ATL_tammm_G.c
+@@ -479,7 +479,7 @@ static void DoCompNoCopy(ATL_tamm_gOOO_t *pd, ATL_UINT rank, TYPE *wC)
+ #ifndef TCPLX
+ #undef rC
+ #endif
+-void DoLastComp(ATL_tamm_gOOO_t *pd, ATL_UINT rank, TYPE *wC)
++static void DoLastComp(ATL_tamm_gOOO_t *pd, ATL_UINT rank, TYPE *wC)
+ {
+ ipinfo_t *ip=pd->ip;
+ TYPE *wA=pd->wA, *wB=pd->wB, *C=pd->C;
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/atlas/, sci-libs/atlas/files/
@ 2020-09-22 12:14 Aisha Tammy
0 siblings, 0 replies; 9+ messages in thread
From: Aisha Tammy @ 2020-09-22 12:14 UTC (permalink / raw
To: gentoo-commits
commit: a0bfa001182d25db1ad6e40c220202bd034651c8
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Tue Sep 22 12:09:30 2020 +0000
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
CommitDate: Tue Sep 22 12:09:30 2020 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a0bfa001
sci-libs/atlas: drop package
present in ::gentoo
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
sci-libs/atlas/atlas-3.10.1-r2.ebuild | 270 -------------------
sci-libs/atlas/atlas-3.10.2.ebuild | 272 --------------------
sci-libs/atlas/atlas-3.10.3.ebuild | 279 --------------------
sci-libs/atlas/atlas-3.11.38-r1.ebuild | 281 --------------------
sci-libs/atlas/atlas-3.11.39.ebuild | 285 ---------------------
.../atlas/files/atlas-3.10.0-x32-support.patch | 93 -------
.../atlas/files/atlas-3.11.39-dolastcomp.patch | 13 -
sci-libs/atlas/files/format-security.patch | 198 --------------
sci-libs/atlas/metadata.xml | 24 --
9 files changed, 1715 deletions(-)
diff --git a/sci-libs/atlas/atlas-3.10.1-r2.ebuild b/sci-libs/atlas/atlas-3.10.1-r2.ebuild
deleted file mode 100644
index 7a4a1d6e4..000000000
--- a/sci-libs/atlas/atlas-3.10.1-r2.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit alternatives-2 eutils fortran-2 multilib toolchain-funcs versionator
-
-LAPACKP=lapack-3.5.0.tgz
-
-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} ) )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fortran generic lapack static-libs threads"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/ATLAS"
-
-pkg_setup() {
- local _cpufreq
- for _cpufreq in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
- if [ -f ${_cpufreq} ]; then
- if ! grep -q performance ${_cpufreq}; then
- echo 2> /dev/null performance > ${_cpufreq} || \
- die "${PN} needs all cpu set to performance"
- fi
- fi
- done
- use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.10.0-x32-support.patch
-}
-
-src_configure() {
- # hack needed to trick the flaky gcc detection
- local mycc="$(type -P $(tc-getCC))"
- [[ ${mycc} == *gcc* ]] && mycc=gcc
- atlas_configure() {
- local myconf=(
- --prefix="${ED}/usr"
- --libdir="${ED}/usr/$(get_libdir)"
- --incdir="${ED}/usr/include"
- --cc="$(tc-getCC)"
- "-D c -DWALL"
- "-C acg '${mycc}'"
- "-F acg '${CFLAGS}'"
- "-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
- )
-
- # OpenMP shown to decreased performance over POSIX threads
- # (at least in 3.9.x, see atlas-dev mailing list)
- if use threads; then
- if use generic; then # 2 threads is most generic
- myconf+=( "-t 2" "-Si omp 0" )
- else
- myconf+=( "-t -1" "-Si omp 0" )
- fi
- 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" )
- elif [ ${ABI} = x32 ] ; then
- myconf+=( "-b 48" )
- else
- myconf+=( "-b 64" )
- fi
- elif use ppc || use x86; then
- myconf+=( "-b 32" )
- elif use ia64; then
- myconf+=( "-b 64" )
- fi
- if use fortran; then
- myconf+=(
- "-C if '$(type -P $(tc-getFC))'"
- "-F if '${FFLAGS}'"
- )
- if use lapack; then
- myconf+=(
- "-Si latune 1"
- "--with-netlib-lapack-tarfile=${DISTDIR}/${LAPACKP}"
- )
- else
- myconf+=( "-Si latune 0" )
- fi
- else
- myconf+=( "-Si latune 0" "--nof77" )
- fi
- # generic stuff found by make make xprint_enums in atlas build dir
- # basically assuming sse2+sse1 and 2 threads max
- use generic && use x86 && myconf+=( "-V 384 -A 13")
- use generic && use amd64 && myconf+=( "-V 384 -A 24")
-
- local confdir="${S}_${1}"; shift
- myconf+=( $@ )
- mkdir "${confdir}" && cd "${confdir}"
- # for debugging
- echo ${myconf[@]} > myconf.out
- "${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
- }
-
- atlas_configure shared "-Fa alg -fPIC" ${EXTRA_ECONF}
- use static-libs && atlas_configure static ${EXTRA_ECONF}
-}
-
-src_compile() {
- 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
- }
-
- atlas_compile shared
- use static-libs && atlas_compile static
-}
-
-src_test() {
- cd "${S}_shared"
- emake -j1 check time
-}
-
-# 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} $@
- Libs.private: -L\${libdir} -latlas -lm ${PTLIBS}
- Cflags: -I\${includedir}/${PN}
- ${PCREQ}
- EOF
- insinto /usr/$(get_libdir)/pkgconfig
- doins ${pcname}.pc
-}
-
-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
- 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
- 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
-
- # clapack threaded
- if [[ -e libptclapack.a ]]; then
- atlas_install_libs libptclapack.a -lm -L. -latlas -lptcblas ${PTLIBS}
- atlas_install_pc ptclapack atlas-clapack-threads
- 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
- 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
- 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
- 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
- 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
-}
diff --git a/sci-libs/atlas/atlas-3.10.2.ebuild b/sci-libs/atlas/atlas-3.10.2.ebuild
deleted file mode 100644
index 5e480dd3e..000000000
--- a/sci-libs/atlas/atlas-3.10.2.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit alternatives-2 eutils fortran-2 multilib toolchain-funcs versionator
-
-LAPACKP=lapack-3.6.0.tgz
-
-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} ) )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc fortran generic lapack static-libs threads"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/ATLAS"
-
-pkg_setup() {
- local _cpufreq
- for _cpufreq in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
- if [ -f ${_cpufreq} ]; then
- if ! grep -q performance ${_cpufreq}; then
- echo 2> /dev/null performance > ${_cpufreq} || \
- die "${PN} needs all cpu set to performance"
- fi
- fi
- done
- use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-3.10.0-x32-support.patch \
- "${FILESDIR}"/${P1}format-security.patch
-}
-
-src_configure() {
- # hack needed to trick the flaky gcc detection
- local mycc="$(type -P $(tc-getCC))"
- [[ ${mycc} == *gcc* ]] && mycc=gcc
- atlas_configure() {
- local myconf=(
- --prefix="${ED}/usr"
- --libdir="${ED}/usr/$(get_libdir)"
- --incdir="${ED}/usr/include"
- --cc="$(tc-getCC)"
- "-D c -DWALL"
- "-C acg '${mycc}'"
- "-F acg '${CFLAGS}'"
- "-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
- )
-
- # OpenMP shown to decreased performance over POSIX threads
- # (at least in 3.9.x, see atlas-dev mailing list)
- if use threads; then
- if use generic; then # 2 threads is most generic
- myconf+=( "-t 2" "-Si omp 0" )
- else
- myconf+=( "-t -1" "-Si omp 0" )
- fi
- 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" )
- elif [ ${ABI} = x32 ] ; then
- myconf+=( "-b 48" )
- else
- myconf+=( "-b 64" )
- fi
- elif use ppc || use x86; then
- myconf+=( "-b 32" )
- elif use ia64; then
- myconf+=( "-b 64" )
- fi
- if use fortran; then
- myconf+=(
- "-C if '$(type -P $(tc-getFC))'"
- "-F if '${FFLAGS}'"
- )
- if use lapack; then
- myconf+=(
- "-Si latune 1"
- "--with-netlib-lapack-tarfile=${DISTDIR}/${LAPACKP}"
- )
- else
- myconf+=( "-Si latune 0" )
- fi
- else
- myconf+=( "-Si latune 0" "--nof77" )
- fi
- # generic stuff found by make make xprint_enums in atlas build dir
- # basically assuming sse2+sse1 and 2 threads max
- use generic && use x86 && myconf+=( "-V 384 -A 13")
- use generic && use amd64 && myconf+=( "-V 384 -A 24")
-
- local confdir="${S}_${1}"; shift
- myconf+=( $@ )
- mkdir "${confdir}" && cd "${confdir}"
- # for debugging
- echo ${myconf[@]} > myconf.out
- "${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
- }
-
- atlas_configure shared "-Fa alg -fPIC" ${EXTRA_ECONF}
- use static-libs && atlas_configure static ${EXTRA_ECONF}
-}
-
-src_compile() {
- 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
- }
-
- atlas_compile shared
- use static-libs && atlas_compile static
-}
-
-src_test() {
- cd "${S}_shared"
- emake -j1 check time
-}
-
-# 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} $@
- Libs.private: -L\${libdir} -latlas -lm ${PTLIBS}
- Cflags: -I\${includedir}/${PN}
- ${PCREQ}
- EOF
- insinto /usr/$(get_libdir)/pkgconfig
- doins ${pcname}.pc
-}
-
-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
- 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
- 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
-
- # clapack threaded
- if [[ -e libptclapack.a ]]; then
- atlas_install_libs libptclapack.a -lm -L. -latlas -lptcblas ${PTLIBS}
- atlas_install_pc ptclapack atlas-clapack-threads
- 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
- 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
- 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
- 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
- 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
-}
diff --git a/sci-libs/atlas/atlas-3.10.3.ebuild b/sci-libs/atlas/atlas-3.10.3.ebuild
deleted file mode 100644
index 131790147..000000000
--- a/sci-libs/atlas/atlas-3.10.3.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit alternatives-2 eutils fortran-2 multilib toolchain-funcs versionator
-
-LAPACKP=lapack-3.6.0.tgz
-
-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} ) )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+deprecated doc +fortran generic +lapack static-libs threads"
-
-REQUIRED_USE="
- deprecated? ( lapack )
- lapack? ( fortran )"
-
-S="${WORKDIR}/ATLAS"
-
-pkg_setup() {
- local _cpufreq
- for _cpufreq in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
- if [ -f ${_cpufreq} ]; then
- if ! grep -q performance ${_cpufreq}; then
- echo 2> /dev/null performance > ${_cpufreq} || \
- die "${PN} needs all cpu set to performance"
- fi
- fi
- done
- use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-3.10.0-x32-support.patch \
- "${FILESDIR}"/${P1}format-security.patch
-}
-
-src_configure() {
- # hack needed to trick the flaky gcc detection
- local mycc="$(type -P $(tc-getCC))"
- [[ ${mycc} == *gcc* ]] && mycc=gcc
- atlas_configure() {
- local myconf=(
- --prefix="${ED}/usr"
- --libdir="${ED}/usr/$(get_libdir)"
- --incdir="${ED}/usr/include"
- --cc="$(tc-getCC)"
- "-D c -DWALL"
- "-C acg '${mycc}'"
- "-F acg '${CFLAGS}'"
- "-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
- )
-
- # OpenMP shown to decreased performance over POSIX threads
- # (at least in 3.9.x, see atlas-dev mailing list)
- if use threads; then
- if use generic; then # 2 threads is most generic
- myconf+=( "-t 2" "-Si omp 0" )
- else
- myconf+=( "-t -1" "-Si omp 0" )
- fi
- 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" )
- elif [ ${ABI} = x32 ] ; then
- myconf+=( "-b 48" )
- else
- myconf+=( "-b 64" )
- fi
- elif use ppc || use x86; then
- myconf+=( "-b 32" )
- elif use ia64; then
- myconf+=( "-b 64" )
- fi
- if use fortran; then
- myconf+=(
- "-C if '$(type -P $(tc-getFC))'"
- "-F if '${FFLAGS}'"
- )
- if use lapack; then
- myconf+=(
- "-Si latune 1"
- "--with-netlib-lapack-tarfile=${DISTDIR}/${LAPACKP}"
- )
- else
- myconf+=( "-Si latune 0" )
- fi
- else
- myconf+=( "-Si latune 0" "--nof77" )
- fi
- # generic stuff found by make make xprint_enums in atlas build dir
- # basically assuming sse2+sse1 and 2 threads max
- use generic && use x86 && myconf+=( "-V 384 -A 13")
- use generic && use amd64 && myconf+=( "-V 384 -A 24")
-
- local confdir="${S}_${1}"; shift
- myconf+=( $@ )
- mkdir "${confdir}" && cd "${confdir}" || die
- # for debugging
- echo ${myconf[@]} > myconf.out
- "${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
-
- if use deprecated; then
- echo "BUILD_DEPRECATED=1" >> src/lapack/reference/make.inc.example || die
- fi
- }
-
- atlas_configure shared "-Fa alg -fPIC" ${EXTRA_ECONF}
- use static-libs && atlas_configure static ${EXTRA_ECONF}
-}
-
-src_compile() {
- atlas_compile() {
- pushd "${S}_${1}" > /dev/null || die
- # atlas does its own parallel builds
- emake -j1 build
- cd lib || die
- emake libclapack.a
- [[ -e libptcblas.a ]] && emake libptclapack.a
- popd > /dev/null || die
- }
-
- atlas_compile shared
- use static-libs && atlas_compile static
-}
-
-src_test() {
- cd "${S}_shared" || die
- emake -j1 check time
-}
-
-# 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 || die
- 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} $@
- Libs.private: -L\${libdir} -latlas -lm ${PTLIBS}
- Cflags: -I\${includedir}/${PN}
- ${PCREQ}
- EOF
- insinto /usr/$(get_libdir)/pkgconfig
- doins ${pcname}.pc
-}
-
-src_install() {
- cd "${S}_shared/lib" || die
- # 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 || die
- if use static-libs; then
- mv "${S}"_static/lib/lib{,atl}${l}.a || die
- fi
- 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
- 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
- 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
-
- # clapack threaded
- if [[ -e libptclapack.a ]]; then
- atlas_install_libs libptclapack.a -lm -L. -latlas -lptcblas ${PTLIBS}
- atlas_install_pc ptclapack atlas-clapack-threads
- 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
- 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
- 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
- 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
- alternatives_for lapack atlas-threads 0 \
- /usr/$(get_libdir)/pkgconfig/lapack.pc atlas-lapack-threads.pc
- fi
- fi
- fi
-
- cd "${S}" || die
- insinto /usr/include/${PN}
- doins include/*.h
-
- cd "${S}/doc" || die
- 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
-}
diff --git a/sci-libs/atlas/atlas-3.11.38-r1.ebuild b/sci-libs/atlas/atlas-3.11.38-r1.ebuild
deleted file mode 100644
index 5db98d96b..000000000
--- a/sci-libs/atlas/atlas-3.11.38-r1.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit alternatives-2 eutils fortran-2 linux-info multilib numeric toolchain-funcs versionator
-
-LAPACKP=lapack-3.6.0.tgz
-
-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} ) )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+deprecated doc +fortran generic ifko +lapack static-libs threads"
-
-REQUIRED_USE="
- deprecated? ( lapack )
- lapack? ( fortran )"
-
-S="${WORKDIR}/ATLAS"
-
-pkg_setup() {
- local _cpufreq
- for _cpufreq in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
- if [ -f ${_cpufreq} ]; then
- if ! grep -q performance ${_cpufreq}; then
- echo 2> /dev/null performance > ${_cpufreq} || \
- die "${PN} needs all cpu set to performance"
- fi
- fi
- done
- [[ -e /sys/devices/system/cpu/intel_pstate ]] \
- && die "Intel P-State driver detected. Please reboot with 'intel_pstate=disable' in your cmdline"
- use fortran && fortran-2_pkg_setup
- CONFIG_CHECK="
- !~X86_P4_CLOCKMOD
- !~X86_INTEL_PSTATE
- "
- ERROR_KERNEL_X86_P4_CLOCKMOD="P4 Clockmod frequency scaling influences tuning and needs to be disabled at compile time."
- ERROR_KERNEL_X86_INTEL_PSTATE="Intel Pstate frequency scaling influences tuning and needs to be disabled at compile time."
- linux-info_pkg_setup
-}
-
-src_configure() {
- # hack needed to trick the flaky gcc detection
- local mycc="$(type -P $(tc-getCC))"
- [[ ${mycc} == *gcc* ]] && mycc=gcc
- atlas_configure() {
- local myconf=(
- --prefix="${ED}/usr"
- --libdir="${ED}/usr/$(get_libdir)"
- --incdir="${ED}/usr/include"
- --cc="$(tc-getCC)"
- "-D c -DWALL"
- "-C acg '${mycc}'"
- "-F acg '${CFLAGS}'"
- "-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
- )
-
- # OpenMP shown to decreased performance over POSIX threads
- # (at least in 3.9.x, see atlas-dev mailing list)
- if use threads; then
- if use generic; then # 2 threads is most generic
- myconf+=( "-t 2" "-Si omp 0" )
- else
- myconf+=( "-t -1" "-Si omp 0" )
- fi
- 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" )
- elif [ ${ABI} = x32 ] ; then
- myconf+=( "-b 48" )
- else
- myconf+=( "-b 64" )
- fi
- elif use ppc || use x86; then
- myconf+=( "-b 32" )
- elif use ia64; then
- myconf+=( "-b 64" )
- fi
- if use fortran; then
- myconf+=(
- "-C if '$(type -P $(tc-getFC))'"
- "-F if '${FFLAGS}'"
- )
- if use lapack; then
- myconf+=(
- "-Si latune 1"
- "--with-netlib-lapack-tarfile=${DISTDIR}/${LAPACKP}"
- )
- else
- myconf+=( "-Si latune 0" )
- fi
- else
- myconf+=( "-Si latune 0" "--nof77" )
- fi
- # generic stuff found by make make xprint_enums in atlas build dir
- # basically assuming sse2+sse1 and 2 threads max
- use generic && use x86 && myconf+=( "-V 384 -A 13")
- use generic && use amd64 && myconf+=( "-V 384 -A 24")
-
- local confdir="${S}_${1}"; shift
- myconf+=( $(usex ifko "--use-ifko" "") )
- myconf+=( $@ )
- mkdir "${confdir}" && cd "${confdir}" || die
- # for debugging
- echo ${myconf[@]} > myconf.out
- "${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
-
- if use deprecated; then
- echo "BUILD_DEPRECATED=1" >> src/lapack/reference/make.inc.example || die
- fi
- }
-
- atlas_configure shared "-Fa alg -fPIC" ${EXTRA_ECONF}
- use static-libs && atlas_configure static ${EXTRA_ECONF}
-}
-
-src_compile() {
- atlas_compile() {
- pushd "${S}_${1}" > /dev/null || die
- # atlas does its own parallel builds
- emake -j1 build
- cd lib || die
- emake libclapack.a
- [[ -e libptcblas.a ]] && emake libptclapack.a
- popd > /dev/null || die
- }
-
- atlas_compile shared
- use static-libs && atlas_compile static
-}
-
-src_test() {
- cd "${S}_shared" || die
- emake -j1 check time
-}
-
-# 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)
- local _cmd
- shift
- pushd "${S}_shared"/lib > /dev/null
- _cmd="${LINK:-$(tc-getCC)}"
- _cmd+=" ${LDFLAGS} -shared -Wl,--no-undefined -Wl,-soname=${soname}"
- _cmd+=" -Wl,--whole-archive ${libname}.a -Wl,--no-whole-archive"
- _cmd+=" $@ -o ${soname}"
- einfo "${_cmd}"
- ${_cmd} || die "Creating ${soname} failed"
- dolib.so ${soname}
- dosym ${soname} /usr/$(get_libdir)/${soname%.*}
- popd > /dev/null || die
- 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
- local extra=()
- [[ ${PCREQ} ]] && extra+=( --requires "${PCREQ}" )
- create_pkgconfig \
- --name "${pcname}" \
- --description "${PN} ${pcname}" \
- --libs "-L\${libdir} -l${libname} $@" \
- --libs-private "-L\${libdir} -latlas -lm ${PTLIBS}" \
- --cflags "-I\${includedir}/${PN}" \
- "${extra[@]}" \
- ${pcname}
-}
-
-src_install() {
- cd "${S}_shared/lib" || die
- # 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 || die
- if use static-libs; then
- mv "${S}"_static/lib/lib{,atl}${l}.a || die
- fi
- fi
- done
-
- [[ -e libptcblas.a ]] && PTLIBS="-lpthread"
-
- # atlas
- atlas_install_libs libatlas.a -lm ${PTLIBS}
-
- # cblas
- atlas_install_libs libatlcblas.a -L. -latlas -lm
- atlas_install_pc atlcblas atlas-cblas
- 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 -L. -latlas -lm ${PTLIBS}
- atlas_install_pc ptcblas atlas-cblas-threads
- 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="cblas"
- # clapack
- atlas_install_libs libatlclapack.a -L. -latlcblas -latlas -lm
- atlas_install_pc atlclapack atlas-clapack
-
- # clapack threaded
- if [[ -e libptclapack.a ]]; then
- atlas_install_libs libptclapack.a -L. -lptcblas -latlas -lm ${PTLIBS}
- atlas_install_pc ptclapack atlas-clapack-threads
- fi
- fi
-
- if use fortran; then
- LINK=$(tc-getF77) PCREQ=
-
- # blas
- atlas_install_libs libf77blas.a -L. -latlas -lm
- atlas_install_pc f77blas atlas-blas
- 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 -L. -latlas -lm ${PTLIBS}
- atlas_install_pc ptf77blas atlas-blas-threads
- alternatives_for blas atlas-threads 0 \
- /usr/$(get_libdir)/pkgconfig/blas.pc atlas-blas-threads.pc
- fi
-
- if use lapack; then
- PCREQ="blas cblas"
- # lapack
- atlas_install_libs libatllapack.a \
- -L. -latlcblas -lf77blas -latlas -lm
- atlas_install_pc atllapack atlas-lapack
- 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 \
- -L. -lptcblas -lptf77blas -latlas -lm ${PTLIBS}
- atlas_install_pc ptlapack atlas-lapack-threads
- alternatives_for lapack atlas-threads 0 \
- /usr/$(get_libdir)/pkgconfig/lapack.pc atlas-lapack-threads.pc
- fi
- fi
- fi
-
- cd "${S}" || die
- insinto /usr/include/${PN}
- doins include/*.h
-
- cd "${S}/doc" || die
- 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
-}
diff --git a/sci-libs/atlas/atlas-3.11.39.ebuild b/sci-libs/atlas/atlas-3.11.39.ebuild
deleted file mode 100644
index f4b65140c..000000000
--- a/sci-libs/atlas/atlas-3.11.39.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-
-inherit alternatives-2 eutils fortran-2 linux-info multilib numeric toolchain-funcs versionator
-
-LAPACKP=lapack-3.7.0.tgz
-
-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} ) )"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+deprecated doc +fortran generic ifko +lapack static-libs threads"
-
-REQUIRED_USE="
- deprecated? ( lapack )
- lapack? ( fortran )"
-
-S="${WORKDIR}/ATLAS"
-
-PATCHES=(
- "${FILESDIR}"/${P}-dolastcomp.patch
-)
-
-pkg_setup() {
- local _cpufreq
- for _cpufreq in /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor; do
- if [ -f ${_cpufreq} ]; then
- if ! grep -q performance ${_cpufreq}; then
- echo 2> /dev/null performance > ${_cpufreq} || \
- die "${PN} needs all cpu set to performance"
- fi
- fi
- done
- [[ -e /sys/devices/system/cpu/intel_pstate ]] \
- && die "Intel P-State driver detected. Please reboot with 'intel_pstate=disable' in your cmdline"
- use fortran && fortran-2_pkg_setup
- CONFIG_CHECK="
- !~X86_P4_CLOCKMOD
- !~X86_INTEL_PSTATE
- "
- ERROR_KERNEL_X86_P4_CLOCKMOD="P4 Clockmod frequency scaling influences tuning and needs to be disabled at compile time."
- ERROR_KERNEL_X86_INTEL_PSTATE="Intel Pstate frequency scaling influences tuning and needs to be disabled at compile time."
- linux-info_pkg_setup
-}
-
-src_configure() {
- # hack needed to trick the flaky gcc detection
- local mycc="$(type -P $(tc-getCC))"
- [[ ${mycc} == *gcc* ]] && mycc=gcc
- atlas_configure() {
- local myconf=(
- --prefix="${ED}/usr"
- --libdir="${ED}/usr/$(get_libdir)"
- --incdir="${ED}/usr/include"
- --cc="$(tc-getCC)"
- "-D c -DWALL"
- "-C acg '${mycc}'"
- "-F acg '${CFLAGS}'"
- "-Ss pmake '\$(MAKE) ${MAKEOPTS}'"
- )
-
- # OpenMP shown to decreased performance over POSIX threads
- # (at least in 3.9.x, see atlas-dev mailing list)
- if use threads; then
- if use generic; then # 2 threads is most generic
- myconf+=( "-t 2" "-Si omp 0" )
- else
- myconf+=( "-t -1" "-Si omp 0" )
- fi
- 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" )
- elif [ ${ABI} = x32 ] ; then
- myconf+=( "-b 48" )
- else
- myconf+=( "-b 64" )
- fi
- elif use ppc || use x86; then
- myconf+=( "-b 32" )
- elif use ia64; then
- myconf+=( "-b 64" )
- fi
- if use fortran; then
- myconf+=(
- "-C if '$(type -P $(tc-getFC))'"
- "-F if '${FFLAGS}'"
- )
- if use lapack; then
- myconf+=(
- "-Si latune 1"
- "--with-netlib-lapack-tarfile=${DISTDIR}/${LAPACKP}"
- )
- else
- myconf+=( "-Si latune 0" )
- fi
- else
- myconf+=( "-Si latune 0" "--nof77" )
- fi
- # generic stuff found by make make xprint_enums in atlas build dir
- # basically assuming sse2+sse1 and 2 threads max
- use generic && use x86 && myconf+=( "-V 384 -A 13")
- use generic && use amd64 && myconf+=( "-V 384 -A 24")
-
- local confdir="${S}_${1}"; shift
- myconf+=( $(usex ifko "--use-ifko" "") )
- myconf+=( $@ )
- mkdir "${confdir}" && cd "${confdir}" || die
- # for debugging
- echo ${myconf[@]} > myconf.out
- "${S}"/configure ${myconf[@]} || die "configure in ${confdir} failed"
-
- if use deprecated; then
- echo "BUILD_DEPRECATED=1" >> src/lapack/reference/make.inc.example || die
- fi
- }
-
- atlas_configure shared "-Fa alg -fPIC" ${EXTRA_ECONF}
- use static-libs && atlas_configure static ${EXTRA_ECONF}
-}
-
-src_compile() {
- atlas_compile() {
- pushd "${S}_${1}" > /dev/null || die
- # atlas does its own parallel builds
- emake -j1 build
- cd lib || die
- emake libclapack.a
- [[ -e libptcblas.a ]] && emake libptclapack.a
- popd > /dev/null || die
- }
-
- atlas_compile shared
- use static-libs && atlas_compile static
-}
-
-src_test() {
- cd "${S}_shared" || die
- emake -j1 check time
-}
-
-# 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)
- local _cmd
- shift
- pushd "${S}_shared"/lib > /dev/null
- _cmd="${LINK:-$(tc-getCC)}"
- _cmd+=" ${LDFLAGS} -shared -Wl,--no-undefined -Wl,-soname=${soname}"
- _cmd+=" -Wl,--whole-archive ${libname}.a -Wl,--no-whole-archive"
- _cmd+=" $@ -o ${soname}"
- einfo "${_cmd}"
- ${_cmd} || die "Creating ${soname} failed"
- dolib.so ${soname}
- dosym ${soname} /usr/$(get_libdir)/${soname%.*}
- popd > /dev/null || die
- 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
- local extra=()
- [[ ${PCREQ} ]] && extra+=( --requires "${PCREQ}" )
- create_pkgconfig \
- --name "${pcname}" \
- --description "${PN} ${pcname}" \
- --libs "-L\${libdir} -l${libname} $@" \
- --libs-private "-L\${libdir} -latlas -lm ${PTLIBS}" \
- --cflags "-I\${includedir}/${PN}" \
- "${extra[@]}" \
- ${pcname}
-}
-
-src_install() {
- cd "${S}_shared/lib" || die
- # 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 || die
- if use static-libs; then
- mv "${S}"_static/lib/lib{,atl}${l}.a || die
- fi
- fi
- done
-
- [[ -e libptcblas.a ]] && PTLIBS="-lpthread"
-
- # atlas
- atlas_install_libs libatlas.a -lm ${PTLIBS}
-
- # cblas
- atlas_install_libs libatlcblas.a -L. -latlas -lm
- atlas_install_pc atlcblas atlas-cblas
- 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 -L. -latlas -lm ${PTLIBS}
- atlas_install_pc ptcblas atlas-cblas-threads
- 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="cblas"
- # clapack
- atlas_install_libs libatlclapack.a -L. -latlcblas -latlas -lm
- atlas_install_pc atlclapack atlas-clapack
-
- # clapack threaded
- if [[ -e libptclapack.a ]]; then
- atlas_install_libs libptclapack.a -L. -lptcblas -latlas -lm ${PTLIBS}
- atlas_install_pc ptclapack atlas-clapack-threads
- fi
- fi
-
- if use fortran; then
- LINK=$(tc-getF77) PCREQ=
-
- # blas
- atlas_install_libs libf77blas.a -L. -latlas -lm
- atlas_install_pc f77blas atlas-blas
- 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 -L. -latlas -lm ${PTLIBS}
- atlas_install_pc ptf77blas atlas-blas-threads
- alternatives_for blas atlas-threads 0 \
- /usr/$(get_libdir)/pkgconfig/blas.pc atlas-blas-threads.pc
- fi
-
- if use lapack; then
- PCREQ="blas cblas"
- # lapack
- atlas_install_libs libatllapack.a \
- -L. -latlcblas -lf77blas -latlas -lm
- atlas_install_pc atllapack atlas-lapack
- 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 \
- -L. -lptcblas -lptf77blas -latlas -lm ${PTLIBS}
- atlas_install_pc ptlapack atlas-lapack-threads
- alternatives_for lapack atlas-threads 0 \
- /usr/$(get_libdir)/pkgconfig/lapack.pc atlas-lapack-threads.pc
- fi
- fi
- fi
-
- cd "${S}" || die
- insinto /usr/include/${PN}
- doins include/*.h
-
- cd "${S}/doc" || die
- 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
-}
diff --git a/sci-libs/atlas/files/atlas-3.10.0-x32-support.patch b/sci-libs/atlas/files/atlas-3.10.0-x32-support.patch
deleted file mode 100644
index 82e698069..000000000
--- a/sci-libs/atlas/files/atlas-3.10.0-x32-support.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- ATLAS/CONFIG/src/SpewMakeInc.c.orig 2012-05-24 00:56:27.000000000 +0200
-+++ ATLAS/CONFIG/src/SpewMakeInc.c 2012-06-06 15:17:40.000000000 +0200
-@@ -370,7 +370,7 @@
- }
- *f2cdefs = fdefs;
- *ecdefs = cdefs;
-- if (*ptrbits != 32 && *ptrbits != 64)
-+ if (*ptrbits != 32 && *ptrbits != 64 && *ptrbits != 48)
- *ptrbits = 0;
- }
- char *GetPtrbitsFlag(enum OSTYPE OS, enum MACHTYPE arch, int ptrbits,
-@@ -418,6 +418,8 @@
- sp = "-m64";
- else if (ptrbits == 32)
- sp = "-m32";
-+ else if (ptrbits == 48 && MachIsX86(arch))
-+ sp = "-mx32";
- }
- return(sp);
- }
---- ATLAS/CONFIG/src/gnuccw.c.orig 2012-06-06 15:30:05.000000000 +0200
-+++ ATLAS/CONFIG/src/gnuccw.c 2012-06-06 15:33:29.000000000 +0200
-@@ -363,7 +363,7 @@
- * -m64/32 args get passed to comp, asm & linker
- */
- else if (at->len == 4 &&
-- (!strcmp(at->arg, "-m64") || !strcmp(at->arg, "-m32")))
-+ (!strcmp(at->arg, "-m64") || !strcmp(at->arg, "-m32") || !strcmp(at->arg, "-mx32")))
- {
- if (at->arg[2] == '6')
- *BITS = 64;
---- ATLAS/CONFIG/src/gcc3p.c.orig 2012-06-06 15:29:38.000000000 +0200
-+++ ATLAS/CONFIG/src/gcc3p.c 2012-06-06 15:31:17.000000000 +0200
-@@ -352,7 +352,7 @@
- * -m64/32 args get passed to comp, asm & linker
- */
- else if (at->len == 4 &&
-- (!strcmp(at->arg, "-m64") || !strcmp(at->arg, "-m32")))
-+ (!strcmp(at->arg, "-m64") || !strcmp(at->arg, "-m32") || !strcmp(at->arg, "-mx32")))
- {
- if (at->arg[2] == '6')
- {
---- ATLAS/CONFIG/src/gnuf90w.c.orig 2012-06-06 15:29:28.000000000 +0200
-+++ ATLAS/CONFIG/src/gnuf90w.c 2012-06-06 15:30:36.000000000 +0200
-@@ -363,7 +363,7 @@
- * -m64/32 args get passed to comp, asm & linker
- */
- else if (at->len == 4 &&
-- (!strcmp(at->arg, "-m64") || !strcmp(at->arg, "-m32")))
-+ (!strcmp(at->arg, "-m64") || !strcmp(at->arg, "-m32") || !strcmp(at->arg, "-mx32")))
- {
- if (at->arg[2] == '6')
- *BITS = 64;
---- ATLAS/CONFIG/src/probe_comp.c.orig 2012-06-06 15:29:51.000000000 +0200
-+++ ATLAS/CONFIG/src/probe_comp.c 2012-06-06 15:32:50.000000000 +0200
-@@ -614,6 +614,8 @@
- sp = "-m64";
- else if (ptrbits == 32)
- sp = "-m32";
-+ else if (ptrbits == 48)
-+ sp = "-mx32";
- }
- return(sp);
- }
-@@ -1691,7 +1693,7 @@
- }
- }
- }
-- if (*ptrbits != 32 && *ptrbits != 64)
-+ if (*ptrbits != 32 && *ptrbits != 64 && *ptrbits != 48)
- *ptrbits = 0;
- }
-
---- ATLAS/CONFIG/src/config.c.orig 2012-06-06 15:59:53.000000000 +0200
-+++ ATLAS/CONFIG/src/config.c 2012-06-06 16:00:07.000000000 +0200
-@@ -183,7 +183,7 @@
- i = sprintf(ln, "make IRun_comp args=\"-v %d -o atlconf.txt -O %d -A %d -Si nof77 %d -V %d %s %s",
- verb, OS, arch, nof77, vecext, targarg, flags);
- free(flags);
-- if (ptrbits == 64 || ptrbits == 32)
-+ if (ptrbits == 64 || ptrbits == 32 || ptrbits == 48)
- {
- sprintf(stmp, "-b %d", ptrbits);
- ln = NewAppendedString(ln, stmp);
-@@ -1272,7 +1272,7 @@
- }
- *f2cdefs = fdefs;
- *ecdefs = cdefs;
-- if (*ptrbits != 32 && *ptrbits != 64)
-+ if (*ptrbits != 32 && *ptrbits != 64 && *ptrbits != 48)
- *ptrbits = 0;
- }
-
diff --git a/sci-libs/atlas/files/atlas-3.11.39-dolastcomp.patch b/sci-libs/atlas/files/atlas-3.11.39-dolastcomp.patch
deleted file mode 100644
index 3cd554cf4..000000000
--- a/sci-libs/atlas/files/atlas-3.11.39-dolastcomp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/threads/blas/level3/ATL_tammm_G.c b/src/threads/blas/level3/ATL_tammm_G.c
-index a43a08b..77c78f4 100644
---- a/src/threads/blas/level3/ATL_tammm_G.c
-+++ b/src/threads/blas/level3/ATL_tammm_G.c
-@@ -479,7 +479,7 @@ static void DoCompNoCopy(ATL_tamm_gOOO_t *pd, ATL_UINT rank, TYPE *wC)
- #ifndef TCPLX
- #undef rC
- #endif
--void DoLastComp(ATL_tamm_gOOO_t *pd, ATL_UINT rank, TYPE *wC)
-+static void DoLastComp(ATL_tamm_gOOO_t *pd, ATL_UINT rank, TYPE *wC)
- {
- ipinfo_t *ip=pd->ip;
- TYPE *wA=pd->wA, *wB=pd->wB, *C=pd->C;
diff --git a/sci-libs/atlas/files/format-security.patch b/sci-libs/atlas/files/format-security.patch
deleted file mode 100644
index f3f45d774..000000000
--- a/sci-libs/atlas/files/format-security.patch
+++ /dev/null
@@ -1,198 +0,0 @@
- bin/atlas_install.c | 46 +++++++++++++++++++++++-----------------------
- 1 file changed, 23 insertions(+), 23 deletions(-)
-
-diff --git a/bin/atlas_install.c b/bin/atlas_install.c
-index 2753cbf..21b716d 100644
---- a/bin/atlas_install.c
-+++ b/bin/atlas_install.c
-@@ -483,9 +483,9 @@ void PrintStartStop(FILE *fp0, FILE *fp1, int nspc, int START, int sec,
- fprintf(fp1, "\n\n");
- }
- if (fp0)
-- fprintf(fp0, ln);
-+ fprintf(fp0, "%s", ln);
- if (fp1)
-- fprintf(fp1, ln);
-+ fprintf(fp1, "%s", ln);
- }
-
- int LnIsCont(char *ln)
-@@ -776,11 +776,11 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- if (DefInstall)
- {
- sprintf(ln, "%s IRunMMDef pre=%c %s %s\n", fmake, pre, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2);
- }
- sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2);
- PrintBanner(ln2, 0, 2, ip+1, 1);
- }
-@@ -836,7 +836,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- if (!FileExists(fnam))
- {
- sprintf(ln, "%s %s pre=%c %s %s", fmake, fnam, pre, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2);
- }
- fp = fopen(fnam, "r");
-@@ -854,7 +854,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- {
- sprintf(ln, "%s %s pre=%c nb=%d %s %s",
- fmake, fnam, pre, ncnb, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2);
- }
- GetInstLogFile(fnam, pre, &muladd, &pf, &lat, &nb, &mu, &nu, &ku,
-@@ -881,7 +881,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- }
-
- sprintf(ln, "%s MMinstall pre=%c %s %s\n", fmake, pre, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "BUILDING BLOCK MATMUL TUNE", ln2);
-
- fprintf(fpsum, "\n");
-@@ -896,7 +896,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- PrintBanner(ln2, 1, 2, ip+1, 2);
- sprintf(ln, "%s INSTALL_LOG/atlas_cacheedge.h pre=%c %s %s\n",
- fmake, pre, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "CACHEEDGE DETECTION", ln2);
- PrintBanner(ln2, 0, 2, ip+1, 2);
- }
-@@ -922,7 +922,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- {
- sprintf(ln, "%s %s pre=%c %s %s\n",
- fmake, ln3, pre, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "CACHEEDGE DETECTION", ln2);
- }
- fp = fopen(ln3, "r");
-@@ -955,7 +955,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- "\n\n STAGE 2-%d-3: COPY/NO-COPY CROSSOVER DETECTION\n", ip+1);
-
- sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "COPY/NO-COPY CROSSOVER DETECTION", ln2);
- PrintBanner(ln2, 0, 2, ip+1, 3);
- fprintf(stdout, " done.\n");
-@@ -970,17 +970,17 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- {
- sprintf(ln, "%s INSTALL_LOG/atlas_%ctrsmXover.h pre=%c %s %s\n",
- fmake, pre, pre, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "L3BLAS TUNING", ln2);
- }
- else
- {
- sprintf(ln, "%s Il3lib pre=%c %s %s\n", fmake, pre, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "L3BLAS TUNING", ln2);
- }
- sprintf(ln, "%s %ccblaslib %s %s\n", fmake, pre, redir, ln2); /* cblas */
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "L3BLAS TUNING", ln2);
- PrintBanner(ln2, 0, 2, ip+1, 5);
- PrintStartStop(stdout, fpsum, 3, 0, 2, ip+1, 4, "L3BLAS TUNE");
-@@ -993,7 +993,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- sprintf(ln2, "INSTALL_LOG/%cMVNTUNE.LOG", pre);
- PrintBanner(ln2, 1, 2, ip+1, 7);
- sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "MVNTUNE", ln2);
- ATL_Cassert(FileIsThere(fnam), "MVNTUNE", ln2);
- PrintBanner(ln2, 0, 2, ip+1, 7);
-@@ -1026,7 +1026,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- sprintf(ln2, "INSTALL_LOG/%cMVTTUNE.LOG", pre);
- PrintBanner(ln2, 1, 2, ip+1, 7);
- sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "MVTTUNE", ln2);
- ATL_Cassert(FileIsThere(fnam), "MVTTUNE", ln2);
- PrintBanner(ln2, 0, 2, ip+1, 7);
-@@ -1061,7 +1061,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- sprintf(ln2, "INSTALL_LOG/%cR1TUNE.LOG", pre);
- PrintBanner(ln2, 1, 2, ip+1, 7);
- sprintf(ln, "%s %s pre=%c %s %s\n", fmake, fnam, pre, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "R1TUNE", ln2);
- ATL_Cassert(FileIsThere(fnam), "R1TUNE", ln2);
- PrintBanner(ln2, 0, 2, ip+1, 7);
-@@ -1099,7 +1099,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- sprintf(ln2, "INSTALL_LOG/LIBBUILD.LOG");
- PrintBanner(ln2, 1, 3, 1, 1);
- sprintf(ln, "%s IBuildLibs %s %s\n", fmake, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "LIBRARY BUILD", ln2);
- ATL_Cassert(FileIsThere(fnam), "LIBRARY BUILD", ln2);
- PrintBanner(ln2, 0, 3, 1, 1);
-@@ -1110,7 +1110,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- PrintBanner(ln2, 1, 4, 1, 1);
- PrintStartStop(stdout, fpsum, 3, 1, 4, 1, 1, "TRSM TUNE");
- sprintf(ln, "%s IPostTune %s %s\n", fmake, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "POST-BUILD TUNE", ln2);
- PrintStartStop(stdout, fpsum, 3, 0, 4, 1, 0, NULL);
- ATL_Cassert(FileIsThere(fnam), "POST-BUILD TUNE", ln2);
-@@ -1121,7 +1121,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- sprintf(ln2, "INSTALL_LOG/PTTUNE.LOG");
- PrintBanner(ln2, 1, 4, 2, 0);
- sprintf(ln, "%s IPTtune %s %s\n", fmake, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "THREADING TUNE", ln2);
- PrintStartStop(stdout, fpsum, 3, 0, 4, 2, 0, "THREADING TUNE");
-
-@@ -1129,7 +1129,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- sprintf(ln2, "INSTALL_LOG/LIBPTBUILD.LOG");
- PrintBanner(ln2, 1, 4, 2, 1);
- sprintf(ln, "%s IBuildPtlibs %s %s\n", fmake, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "PTLIBRARY BUILD", ln2);
- PrintBanner(ln2, 0, 4, 2, 1);
- PrintStartStop(stdout, fpsum, 3, 0, 4, 2, 1, "THREADING BUILD");
-@@ -1144,7 +1144,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- PrintStartStop(stdout, fpsum, 6, 1, 4, 3, ip+1, ln2);
- sprintf(ln2, "INSTALL_LOG/%cLATUNE.LOG", pre);
- PrintBanner(ln2, 1, 4, 3, ip+1);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- sprintf(ln, "%s ILATune pre=%c %s %s\n", fmake, pre, redir, ln2);
- ATL_Cassert(system(ln)==0, "LAPACK TUNE", ln2);
- PrintStartStop(stdout, fpsum, 6, 0, 4, 3, ip+1, NULL);
-@@ -1162,7 +1162,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- #else
- sprintf(ln, "%s IBuildLibs %s %s\n", fmake, redir, ln2);
- #endif
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "STATIC LIBRARY UPDATE", ln2);
- PrintBanner(ln2, 0, 5, 1, 1);
- PrintStartStop(stdout, fpsum, 3, 0, 5, 1, 0, "FINAL STATIC LIBRARY UPDATE");
-@@ -1172,7 +1172,7 @@ void GoToTown(int ARCHDEF, int L1DEF, int TuneLA)
- sprintf(ln2, "INSTALL_LOG/LIBDYBUILD.LOG");
- PrintBanner(ln2, 1, 5, 2, 1);
- sprintf(ln, "%s IBuildDyLibs %s %s\n", fmake, redir, ln2);
-- fprintf(stdout, ln);
-+ fprintf(stdout, "%s", ln);
- ATL_Cassert(system(ln)==0, "DYLIBRARY BUILD", ln2);
- PrintBanner(ln2, 0, 5, 2, 1);
- PrintStartStop(stdout, fpsum, 3, 0, 5, 2, 0, NULL);
diff --git a/sci-libs/atlas/metadata.xml b/sci-libs/atlas/metadata.xml
deleted file mode 100644
index 616e09a4c..000000000
--- a/sci-libs/atlas/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <longdescription lang="en">
-ATLAS is an approach for the automatic generation and optimization of
-numerical software. Currently ATLAS supplies optimized versions for the
-complete set of linear algebra kernels known as the Basic Linear Algebra
-Subroutines (BLAS) for both c and F77 interfaces. It can also build
-a subset of the linear algebra routine LAPACK library or the full
-LAPACK using the reference LAPACK from Netlib.
-</longdescription>
- <use>
- <flag name="deprecated">Build deprecated routines</flag>
- <flag name="generic">Build atlas assuming a fairly generic architecture (sse2 for x86, core2 for amd64)</flag>
- <flag name="ifko">Use iFKO to improve ATLAS performance (ATTENTION!!! Increases builtime enormously)</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">math-atlas</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2020-09-22 12:14 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-03 18:56 [gentoo-commits] proj/sci:master commit in: sci-libs/atlas/, sci-libs/atlas/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2020-09-22 12:14 Aisha Tammy
2017-06-27 9:49 Justin Lecher
2012-12-13 0:10 Sebastien Fabbro
2012-07-27 22:08 Sebastien Fabbro
2012-07-16 23:21 Sebastien Fabbro
2012-07-03 22:06 Sebastien Fabbro
2012-01-24 5:55 Sebastien Fabbro
2011-08-04 0:06 Andrea Arteaga
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox