diff options
Diffstat (limited to 'sci-libs')
-rw-r--r-- | sci-libs/lapack-atlas/ChangeLog | 7 | ||||
-rw-r--r-- | sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.11 | 6 | ||||
-rw-r--r-- | sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.11-r1 | 6 | ||||
-rw-r--r-- | sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild | 15 | ||||
-rw-r--r-- | sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild | 15 |
5 files changed, 36 insertions, 13 deletions
diff --git a/sci-libs/lapack-atlas/ChangeLog b/sci-libs/lapack-atlas/ChangeLog index 083524a2b224..07eb2e61ca73 100644 --- a/sci-libs/lapack-atlas/ChangeLog +++ b/sci-libs/lapack-atlas/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/lapack-atlas # Copyright 2004-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.13 2006/07/03 08:07:37 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/ChangeLog,v 1.14 2006/07/27 00:18:07 markusle Exp $ + + 26 Jul 2006; Markus Dittrich <markusle@gentoo.org> + lapack-atlas-3.7.11.ebuild, lapack-atlas-3.7.11-r1.ebuild: + Updated shared-libs patchset to resolve issues due to missing + pthread symbols on multiprocessor machines (see #137877). *lapack-atlas-3.7.11-r1 (03 Jul 2006) *lapack-atlas-3.6.0-r2 (03 Jul 2006) diff --git a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.11 b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.11 index 2e69d8d6ba74..d855f1d18820 100644 --- a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.11 +++ b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.11 @@ -1,6 +1,6 @@ -MD5 d2940721d6592f43a5d2e7740d13076d atlas3.6.0-shared-libs.1.patch.bz2 5148 -RMD160 96f9357049fb22e0955ff1375630e542b0bdee7c atlas3.6.0-shared-libs.1.patch.bz2 5148 -SHA256 f669030bf042808a4f4a92c746f3fd3067597d0ec94756ecac63bc331109c565 atlas3.6.0-shared-libs.1.patch.bz2 5148 +MD5 b73bec84950814bd9b62990de180f652 atlas3.6.0-shared-libs.2.patch.bz2 59340 +RMD160 78afe21c52617b7f9681d15052972594432d8650 atlas3.6.0-shared-libs.2.patch.bz2 59340 +SHA256 0f5d954b80d8a3b84b86924beb386ca45d6426f1ae0c616d02930ae6d8bc0e74 atlas3.6.0-shared-libs.2.patch.bz2 59340 MD5 ccde41dd4f41c47e16ebfa8e6dfd1117 atlas3.7.11.tar.bz2 2032724 RMD160 f58b8a85c097bd1bff6a53ee42bcff97240fb8ec atlas3.7.11.tar.bz2 2032724 SHA256 558b9f3f0dc8f63306f99f75d6e6fa762ea3d9d0dea88053e3e8b6f0e6364109 atlas3.7.11.tar.bz2 2032724 diff --git a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.11-r1 b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.11-r1 index 2e69d8d6ba74..d855f1d18820 100644 --- a/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.11-r1 +++ b/sci-libs/lapack-atlas/files/digest-lapack-atlas-3.7.11-r1 @@ -1,6 +1,6 @@ -MD5 d2940721d6592f43a5d2e7740d13076d atlas3.6.0-shared-libs.1.patch.bz2 5148 -RMD160 96f9357049fb22e0955ff1375630e542b0bdee7c atlas3.6.0-shared-libs.1.patch.bz2 5148 -SHA256 f669030bf042808a4f4a92c746f3fd3067597d0ec94756ecac63bc331109c565 atlas3.6.0-shared-libs.1.patch.bz2 5148 +MD5 b73bec84950814bd9b62990de180f652 atlas3.6.0-shared-libs.2.patch.bz2 59340 +RMD160 78afe21c52617b7f9681d15052972594432d8650 atlas3.6.0-shared-libs.2.patch.bz2 59340 +SHA256 0f5d954b80d8a3b84b86924beb386ca45d6426f1ae0c616d02930ae6d8bc0e74 atlas3.6.0-shared-libs.2.patch.bz2 59340 MD5 ccde41dd4f41c47e16ebfa8e6dfd1117 atlas3.7.11.tar.bz2 2032724 RMD160 f58b8a85c097bd1bff6a53ee42bcff97240fb8ec atlas3.7.11.tar.bz2 2032724 SHA256 558b9f3f0dc8f63306f99f75d6e6fa762ea3d9d0dea88053e3e8b6f0e6364109 atlas3.7.11.tar.bz2 2032724 diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild index a7e1d55a51a8..14bdd963bfec 100644 --- a/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild +++ b/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild,v 1.1 2006/07/03 08:07:37 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.7.11-r1.ebuild,v 1.2 2006/07/27 00:18:07 markusle Exp $ inherit eutils flag-o-matic toolchain-funcs fortran @@ -13,7 +13,7 @@ SRC_URI2="http://www.netlib.org/lapack/lapack.tgz" SRC_URI="${SRC_URI1} ${SRC_URI2} mirror://gentoo/lapack-20020531-20021004.patch.bz2 mirror://gentoo/lapack-gentoo.patch - mirror://gentoo/${MY_PN}3.6.0-shared-libs.1.patch.bz2" + mirror://gentoo/${MY_PN}3.6.0-shared-libs.2.patch.bz2" SLOT="0" IUSE="ifc doc" @@ -65,7 +65,7 @@ src_unpack() { cd "${WORKDIR}" epatch "${FILESDIR}"/unbuffered.patch epatch "${FILESDIR}"/${PV}-allow-any-gcc-version.patch - epatch "${DISTDIR}"/atlas3.6.0-shared-libs.1.patch.bz2 + epatch "${DISTDIR}"/atlas3.6.0-shared-libs.2.patch.bz2 epatch "${DISTDIR}"/lapack-20020531-20021004.patch.bz2 epatch "${DISTDIR}"/lapack-gentoo.patch cp "${FILESDIR}"/war "${S}" @@ -85,6 +85,15 @@ src_unpack() { ${S}/makes/Make.lib \ || die "Failed to update for gcc-4" fi + + # make sure shared libs link against proper libraries + if [[ ${FORTRANC} == "gfortran" ]]; then + libs="-lpthread -lgfortran" + else + libs="-lpthread -lg2c" + fi + sed -e "s/SHRD_LNK/${libs}/g" -i ${S}/Make.top || \ + die "Failed to add addtional libs to shared object build" } atlas_fail() { diff --git a/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild b/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild index 8e7d5e517938..fe21e0c5cbd5 100644 --- a/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild +++ b/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild,v 1.3 2006/04/01 19:59:44 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/lapack-atlas/lapack-atlas-3.7.11.ebuild,v 1.4 2006/07/27 00:18:07 markusle Exp $ inherit eutils flag-o-matic toolchain-funcs fortran @@ -13,7 +13,7 @@ SRC_URI2="http://www.netlib.org/lapack/lapack.tgz" SRC_URI="${SRC_URI1} ${SRC_URI2} mirror://gentoo/lapack-20020531-20021004.patch.bz2 mirror://gentoo/lapack-gentoo.patch - mirror://gentoo/${MY_PN}3.6.0-shared-libs.1.patch.bz2" + mirror://gentoo/${MY_PN}3.6.0-shared-libs.2.patch.bz2" SLOT="0" IUSE="ifc doc" @@ -66,7 +66,7 @@ src_unpack() { cd "${WORKDIR}" epatch "${FILESDIR}"/unbuffered.patch epatch "${FILESDIR}"/${PV}-allow-any-gcc-version.patch - epatch "${DISTDIR}"/atlas3.6.0-shared-libs.1.patch.bz2 + epatch "${DISTDIR}"/atlas3.6.0-shared-libs.2.patch.bz2 epatch "${DISTDIR}"/lapack-20020531-20021004.patch.bz2 epatch "${DISTDIR}"/lapack-gentoo.patch cp "${FILESDIR}"/war "${S}" @@ -86,6 +86,15 @@ src_unpack() { ${S}/makes/Make.lib \ || die "Failed to update for gcc-4" fi + + # make sure shared libs link against proper libraries + if [[ ${FORTRANC} == "gfortran" ]]; then + libs="-lpthread -lgfortran" + else + libs="-lpthread -lg2c" + fi + sed -e "s/SHRD_LNK/${libs}/g" -i ${S}/Make.top || \ + die "Failed to add addtional libs to shared object build" } atlas_fail() { |