From: Daniel Goller <morfic@gentoo.org>
Date: Mon, 29 Nov 2004 01:41:04 +0000 (+0000)
Subject: fix clobbering of register 'bx'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4860d6b295d4f89f525caa45800b68708ec037ae;p=gentoo.git

fix clobbering of register 'bx'
---

diff --git a/app-sci/blas-atlas/ChangeLog b/app-sci/blas-atlas/ChangeLog
index 18ed8c8051b6..9ade0aced976 100644
--- a/app-sci/blas-atlas/ChangeLog
+++ b/app-sci/blas-atlas/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-sci/blas-atlas
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/blas-atlas/ChangeLog,v 1.18 2004/11/17 16:38:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/blas-atlas/ChangeLog,v 1.19 2004/11/29 01:41:04 morfic Exp $
+
+  28 Nov 2004; Daniel Goller <morfic@gentoo.org> blas-atlas-3.6.0.ebuild:
+  Fix clobbering of bx register, reference bug 56842 for more information
 
   17 Nov 2004; Markus Rothe <corsair@gentoo.org> blas-atlas-3.6.0.ebuild:
   stable on ppc64
diff --git a/app-sci/blas-atlas/Manifest b/app-sci/blas-atlas/Manifest
index 3379646870b8..9b5ad124670e 100644
--- a/app-sci/blas-atlas/Manifest
+++ b/app-sci/blas-atlas/Manifest
@@ -1,9 +1,19 @@
-MD5 2cfd815d73e607aa54f355d6a01f7566 ChangeLog 2657
-MD5 4a521dea733e897598342ab3b14abac3 blas-atlas-3.6.0.ebuild 3740
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5f4e25157c1dfc508b9ab8ff9a1e7955 blas-atlas-3.6.0.ebuild 4153
+MD5 1f1c90fcc90a32c794c6756de7235604 ChangeLog 2805
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 646c8df3efa24d6573a870dbb0f5fc8d files/f77-ATLAS 457
+MD5 13d26350d75e6993f1b3ec48ca97f14e files/war 545
 MD5 73bb69e091e5629e3d47ec813d560223 files/c-ATLAS 497
+MD5 646c8df3efa24d6573a870dbb0f5fc8d files/f77-ATLAS 457
 MD5 a12493a52d3484ebdcaa90f5e250129a files/c-threaded-ATLAS 564
-MD5 c1c57e922c1763ddde357504442e94c4 files/digest-blas-atlas-3.6.0 139
 MD5 c0a79db6ec6fb95a56ce677107f08c01 files/f77-threaded-ATLAS 492
-MD5 13d26350d75e6993f1b3ec48ca97f14e files/war 545
+MD5 c1c57e922c1763ddde357504442e94c4 files/digest-blas-atlas-3.6.0 139
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBqn4zUpKYMelfdYERAihMAKCGnaOjjygFTwCmuBwSppRuaaY47wCfb4Wr
+w1ysUo+edGbGsTCtuQ6of3c=
+=WIDA
+-----END PGP SIGNATURE-----
diff --git a/app-sci/blas-atlas/blas-atlas-3.6.0.ebuild b/app-sci/blas-atlas/blas-atlas-3.6.0.ebuild
index ca656c13003a..be6b72841882 100644
--- a/app-sci/blas-atlas/blas-atlas-3.6.0.ebuild
+++ b/app-sci/blas-atlas/blas-atlas-3.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/blas-atlas/blas-atlas-3.6.0.ebuild,v 1.17 2004/11/17 16:38:37 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/blas-atlas/blas-atlas-3.6.0.ebuild,v 1.18 2004/11/29 01:41:04 morfic Exp $
 
 inherit eutils toolchain-funcs
 
@@ -37,6 +37,7 @@ src_unpack() {
 
 	cd ${S}
 	epatch ${DISTDIR}/atlas3.6.0-shared-libs.patch.bz2
+	sed -i -e "s:ASM:ASM VOLATILE:" include/contrib/camm_dpa.h || die "sed failed to fix clobbering"
 	cp ${FILESDIR}/war ${S}
 	chmod a+x ${S}/war
 }
@@ -56,23 +57,34 @@ atlas_fail() {
 reconfigure() {
 	case "`uname -p`" in
 		"sun4m")
-			MY_CCFLAG0="-O3 -mcpu=v8"
+			MY_CCFLAGS="-O3 -mcpu=v8"
+			MY_CXXFLAGS="${MY_CCFLAGS}"
 			MY_MMFLAGS="-O -mcpu=v8"
+			MY_LDFLAGS=""
 			;;
 		"sun4u")
-			MY_CCFLAG0="-O3 -mcpu=ultrasparc"
+			MY_CCFLAGS="-O3 -mcpu=ultrasparc"
+			MY_CXXFLAGS="${MY_CCFLAGS}"
 			MY_MMFLAGS="-O -mcpu=ultrasparc"
+			MY_LDFLAGS=""
 			;;
 		*)
-			MY_CCFLAG0="${CFLAGS}"
+			MY_CCFLAGS="${CFLAGS}"
+			MY_CXXFLAGS="${CXXFLAGS}"
 			MY_MMFLAGS="${CFLAGS}"
+			MY_LDFLAGS="${LDFLAGS}"
 			;;
 	esac
 
 	MY_FILE="`find -name Make.Linux*`"
 
-	sed -i -e "s/CCFLAG0 =/CCFLAG0 = ${MY_CCFLAG0}\n#&/1" ${MY_FILE}
-	sed -i -e "s/MMFLAGS =/MMFLAGS = ${MY_MMFLAGS}\n#&/" ${MY_FILE}
+	sed -i -e "s/CCFLAG0 =.*/CCFLAG0 = \$(CDEFS) ${MY_CCFLAGS}/" \
+		-e "s/CCFLAGS =.*/CCFLAGS = \$(CDEFS) ${MY_CCFLAGS}/" \
+		-e "s/CLINKFLAGS =.*/CLINKFLAGS =\$(CDEFS) ${MY_LDFLAGS}/" \
+		-e "s/XCCFLAGS =.*/XCCFLAGS =\$(CDEFS) ${MY_CXXFLAGS}/" \
+		-e "s/MMFLAGS =.*/MMFLAGS = ${MY_MMFLAGS}/" \
+		${MY_FILE} || die "sed didnt complete"
+
 }
 
 src_compile() {
@@ -88,9 +100,7 @@ src_compile() {
 		(echo | make config CC="$(tc-getCC) -DUSE_LIBTOOL") || atlas_fail
 	fi
 
-	if [ "${ARCH}" == "sparc" ]; then
-		reconfigure
-	fi
+	reconfigure
 
 	TMPSTR=$(ls Make.Linux*)
 	ATLAS_ARCH=${TMPSTR#'Make.'}