From: Luca Barbato Date: Sat, 17 Jun 2006 00:34:48 +0000 (+0000) Subject: Fix #120775 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=74426867a70f4c88f0a2639793492f9a1a47044c;p=gentoo.git Fix #120775 Package-Manager: portage-2.1 --- diff --git a/sci-libs/blas-atlas/ChangeLog b/sci-libs/blas-atlas/ChangeLog index 77b97f438619..f65a5bdc3019 100644 --- a/sci-libs/blas-atlas/ChangeLog +++ b/sci-libs/blas-atlas/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sci-libs/blas-atlas # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.23 2006/05/23 20:13:19 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/ChangeLog,v 1.24 2006/06/17 00:34:47 lu_zero Exp $ + + 17 Jun 2006; Luca Barbato + +files/3.6.0-ppc-configure.patch, +files/3.7.11-ppc-configure.patch, + blas-atlas-3.6.0-r1.ebuild, blas-atlas-3.7.11.ebuild: + Fix #120775 for 3.6.0-r1 + + 16 Jun 2006; Luca Barbato + +files/3.7.11-ppc-configure.patch, blas-atlas-3.7.11.ebuild: + Fix #120775 for 3.7.11 23 May 2006; Markus Rothe blas-atlas-3.6.0-r1.ebuild: Stable on ppc64 diff --git a/sci-libs/blas-atlas/Manifest b/sci-libs/blas-atlas/Manifest index 3f6e71e1eef1..6a311f97136a 100644 --- a/sci-libs/blas-atlas/Manifest +++ b/sci-libs/blas-atlas/Manifest @@ -1,17 +1,77 @@ -MD5 09943f3b111b5980d03c137b32b85b64 ChangeLog 6572 -MD5 1ea09c5fd26c314de867f113b489bff7 blas-atlas-3.6.0-r1.ebuild 4265 -MD5 ed007718b2de7aecfaba88bd2623e60d blas-atlas-3.6.0.ebuild 4258 -MD5 7c557aafda64ad6b2849bbb76a819ee1 blas-atlas-3.7.10.ebuild 4166 -MD5 8626004b2834720721b6a27af860c834 blas-atlas-3.7.11.ebuild 4756 +AUX 3.6.0-ppc-configure.patch 448 RMD160 10f1ed25bb5b40be81b80a7b213f609f5290a676 SHA1 be876d4fdd1db8d2c4abbefaa665723867add1e3 SHA256 a61820e4434f28703f15c1e5a9a8f0f3b52b91cd8680835ea14490d991b79dc7 +MD5 71df76ba613f53fa7e454154b4e8553e files/3.6.0-ppc-configure.patch 448 +RMD160 10f1ed25bb5b40be81b80a7b213f609f5290a676 files/3.6.0-ppc-configure.patch 448 +SHA256 a61820e4434f28703f15c1e5a9a8f0f3b52b91cd8680835ea14490d991b79dc7 files/3.6.0-ppc-configure.patch 448 +AUX 3.7.11-allow-any-gcc-version.patch 841 RMD160 0274d6286be0d35fb4bcc1a3b6e39b4a5179bbfa SHA1 da0157ab5932188865ae5573eb40c2548abdd71a SHA256 9031e6386d5e082be14d7d6e67b38a833893a404193239746e9d94162ccd7c87 MD5 ba55197b98178c74b13d36833675ca88 files/3.7.11-allow-any-gcc-version.patch 841 +RMD160 0274d6286be0d35fb4bcc1a3b6e39b4a5179bbfa files/3.7.11-allow-any-gcc-version.patch 841 +SHA256 9031e6386d5e082be14d7d6e67b38a833893a404193239746e9d94162ccd7c87 files/3.7.11-allow-any-gcc-version.patch 841 +AUX 3.7.11-ppc-configure.patch 547 RMD160 e91612d4fb1a44f41f76d1fce7c95cd578d8d523 SHA1 58be99b5ac63dab393574bdb04ebdb820c2472fa SHA256 e306f27b070ab1aba14e537b4451886fba391d657aecff9bec7d3b55366f082f +MD5 a34123ba5ed0e855ca25ad0c5f312b7b files/3.7.11-ppc-configure.patch 547 +RMD160 e91612d4fb1a44f41f76d1fce7c95cd578d8d523 files/3.7.11-ppc-configure.patch 547 +SHA256 e306f27b070ab1aba14e537b4451886fba391d657aecff9bec7d3b55366f082f files/3.7.11-ppc-configure.patch 547 +AUX c-ATLAS 497 RMD160 1bca887c53b7132f434a8e6e023721a7a7d6e567 SHA1 8dc57e828646aaa1d2de089a187c7b69973bd9b4 SHA256 4d135a53bf4bce2a373f2154286876bbba5a78ccab48834e3db3a83714f224c8 MD5 73bb69e091e5629e3d47ec813d560223 files/c-ATLAS 497 +RMD160 1bca887c53b7132f434a8e6e023721a7a7d6e567 files/c-ATLAS 497 +SHA256 4d135a53bf4bce2a373f2154286876bbba5a78ccab48834e3db3a83714f224c8 files/c-ATLAS 497 +AUX c-threaded-ATLAS 563 RMD160 410a2f15c4d0c210df778ef53cd15c2400b6a3d7 SHA1 b1e8b5cc85173cd2f5131836897f8b91b2b19e40 SHA256 d3334c1f222589c0ca7794576819b0d9c791d3c37ffac61a2270cb06aa3a8229 MD5 869c65bd1672b6bea4f03520e7e1cdf9 files/c-threaded-ATLAS 563 -MD5 91aec44247d085c47647259eb4fea59b files/digest-blas-atlas-3.6.0 313 -MD5 2b294c37b143e52c772acc38f29ef13d files/digest-blas-atlas-3.6.0-r1 515 -MD5 8677e85d89d21e4f7c2826ba5a17d01e files/digest-blas-atlas-3.7.10 140 -MD5 37b8d5b760fea3fb4ac109827445d08a files/digest-blas-atlas-3.7.11 518 +RMD160 410a2f15c4d0c210df778ef53cd15c2400b6a3d7 files/c-threaded-ATLAS 563 +SHA256 d3334c1f222589c0ca7794576819b0d9c791d3c37ffac61a2270cb06aa3a8229 files/c-threaded-ATLAS 563 +AUX f77-ATLAS 457 RMD160 6a95aad7241ddc2a54737677d79c7720fa976558 SHA1 4e55f5ff5300b565af766df8dc655946227bfd18 SHA256 ad91197efb950f6d26032f229c3f58015c45d6997903c05dcfc39be602e6ae94 MD5 646c8df3efa24d6573a870dbb0f5fc8d files/f77-ATLAS 457 +RMD160 6a95aad7241ddc2a54737677d79c7720fa976558 files/f77-ATLAS 457 +SHA256 ad91197efb950f6d26032f229c3f58015c45d6997903c05dcfc39be602e6ae94 files/f77-ATLAS 457 +AUX f77-threaded-ATLAS 492 RMD160 44a6994cc99be6b217cd3112cd81e2b8a4898d19 SHA1 9b50edb08012b2a968d4abc1214dd696949eaddd SHA256 90fe750bbe7630566be64a99752c38693501d8a1e9f172692de8d0f807b1d3dd MD5 c0a79db6ec6fb95a56ce677107f08c01 files/f77-threaded-ATLAS 492 +RMD160 44a6994cc99be6b217cd3112cd81e2b8a4898d19 files/f77-threaded-ATLAS 492 +SHA256 90fe750bbe7630566be64a99752c38693501d8a1e9f172692de8d0f807b1d3dd files/f77-threaded-ATLAS 492 +AUX unbuffered.patch 497 RMD160 c2a04b5243d32ff378ee76323611e7383464e019 SHA1 321bf9254f6df4d0914288583db00e8418b1e121 SHA256 e21636769e6bebbec34c79bc29b9fdf9c5dbe46803f835b44b102e9d7a90b64e MD5 e362a664ac2e543545706b85664af921 files/unbuffered.patch 497 +RMD160 c2a04b5243d32ff378ee76323611e7383464e019 files/unbuffered.patch 497 +SHA256 e21636769e6bebbec34c79bc29b9fdf9c5dbe46803f835b44b102e9d7a90b64e files/unbuffered.patch 497 +AUX war 545 RMD160 6f44c25e739703f988180959608094aa633db7bf SHA1 d90a66e57395e01b94bac9b444590de8fef77aca SHA256 696a8e1cc3918ce5d19f0aa41250d5f052244527a5e3804b025db7938f06ae7b MD5 13d26350d75e6993f1b3ec48ca97f14e files/war 545 +RMD160 6f44c25e739703f988180959608094aa633db7bf files/war 545 +SHA256 696a8e1cc3918ce5d19f0aa41250d5f052244527a5e3804b025db7938f06ae7b files/war 545 +DIST atlas3.6.0-shared-libs.1.patch.bz2 5148 RMD160 96f9357049fb22e0955ff1375630e542b0bdee7c SHA1 7ad4a9d0dacf75ae4ad308c2f0d1dfa9b17e49f6 SHA256 f669030bf042808a4f4a92c746f3fd3067597d0ec94756ecac63bc331109c565 +DIST atlas3.6.0-shared-libs.patch.bz2 5140 +DIST atlas3.6.0.tar.bz2 1687723 RMD160 e7d40a6677ce7c4442df7152150aecf812020713 SHA1 61dd7ace2f43e9a10864148a71fa443a6eae2c3d SHA256 1c2ad68fe3c66e261c012788fc1b6f74eada791f713848a3a6420c50fa35c8e8 +DIST atlas3.7.10.tar.bz2 2033340 +DIST atlas3.7.11.tar.bz2 2032724 RMD160 f58b8a85c097bd1bff6a53ee42bcff97240fb8ec SHA1 7806c43147535f6422bdaacb4416aa06a5de0f07 SHA256 558b9f3f0dc8f63306f99f75d6e6fa762ea3d9d0dea88053e3e8b6f0e6364109 +EBUILD blas-atlas-3.6.0-r1.ebuild 4311 RMD160 a43731bd3915327ef3f07689adbf6ef2caf486f3 SHA1 07b69b15f6a1575998d1b659248aabb1c1240121 SHA256 d90e4e5a5288289f2616404611f760a575e6a66f4ac2a5a8eba5eb564893f7c9 +MD5 c9b43d3319b5a645fff09aeb96246159 blas-atlas-3.6.0-r1.ebuild 4311 +RMD160 a43731bd3915327ef3f07689adbf6ef2caf486f3 blas-atlas-3.6.0-r1.ebuild 4311 +SHA256 d90e4e5a5288289f2616404611f760a575e6a66f4ac2a5a8eba5eb564893f7c9 blas-atlas-3.6.0-r1.ebuild 4311 +EBUILD blas-atlas-3.6.0.ebuild 4258 RMD160 01a87586d23c5537d549f74bdf710cecce0acc65 SHA1 c1f866b43c4f33c6f3907a1a228165320ca3462d SHA256 ed0985eecc2c6c84a6b13be0c7c129c1f2efb046e8d3a961716282992cf9f17b +MD5 ed007718b2de7aecfaba88bd2623e60d blas-atlas-3.6.0.ebuild 4258 +RMD160 01a87586d23c5537d549f74bdf710cecce0acc65 blas-atlas-3.6.0.ebuild 4258 +SHA256 ed0985eecc2c6c84a6b13be0c7c129c1f2efb046e8d3a961716282992cf9f17b blas-atlas-3.6.0.ebuild 4258 +EBUILD blas-atlas-3.7.10.ebuild 4166 RMD160 6fc9a32014e32bc465050722237b94b10fa51f09 SHA1 98550ad52eb0c6d9f7ebeb8d4cbd728677c42471 SHA256 3212603bb6d0fed40a5c6bbd8097592c1ac43dfea3190ce10b0ecf6b611c7ed0 +MD5 7c557aafda64ad6b2849bbb76a819ee1 blas-atlas-3.7.10.ebuild 4166 +RMD160 6fc9a32014e32bc465050722237b94b10fa51f09 blas-atlas-3.7.10.ebuild 4166 +SHA256 3212603bb6d0fed40a5c6bbd8097592c1ac43dfea3190ce10b0ecf6b611c7ed0 blas-atlas-3.7.10.ebuild 4166 +EBUILD blas-atlas-3.7.11.ebuild 4803 RMD160 01c6b3dc983280fe96972bac9659a9e20c368665 SHA1 fb9ce571b612166c7de856186144a33de5bd7b5d SHA256 afb31d4a01555d4d44a23b0f9f2474a0b93b6132604051cad1d6f86df0d7d1bf +MD5 aca9a5f2ba98c37c907cc32cc9547ac5 blas-atlas-3.7.11.ebuild 4803 +RMD160 01c6b3dc983280fe96972bac9659a9e20c368665 blas-atlas-3.7.11.ebuild 4803 +SHA256 afb31d4a01555d4d44a23b0f9f2474a0b93b6132604051cad1d6f86df0d7d1bf blas-atlas-3.7.11.ebuild 4803 +MISC ChangeLog 6914 RMD160 51f48d68970132962fd8f0c38904cc0c403ad42c SHA1 3555424ad3c9060c8b2577f565c222154640dcab SHA256 088e4614ae8dc7c6d3631b49438fd6bfd8b8c5ea0e2a0f4a7ba0532095ceb695 +MD5 a9b0d6fd70df1cec284795c70b3c221c ChangeLog 6914 +RMD160 51f48d68970132962fd8f0c38904cc0c403ad42c ChangeLog 6914 +SHA256 088e4614ae8dc7c6d3631b49438fd6bfd8b8c5ea0e2a0f4a7ba0532095ceb695 ChangeLog 6914 +MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 +RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156 +SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156 +MD5 91aec44247d085c47647259eb4fea59b files/digest-blas-atlas-3.6.0 313 +RMD160 d9db7551b6c9db82773c56c64033200d1db98576 files/digest-blas-atlas-3.6.0 313 +SHA256 2bbc83dba1d879cf89bfb345780b007e3938c5e333b7e44fa8c2210f9f8e90d6 files/digest-blas-atlas-3.6.0 313 +MD5 2b294c37b143e52c772acc38f29ef13d files/digest-blas-atlas-3.6.0-r1 515 +RMD160 793963ced4dc1c3008a70025eede637d7fcd529c files/digest-blas-atlas-3.6.0-r1 515 +SHA256 6981972ea8934f0c9cc7e527889b1d1cc57712cbdf48d15234b576810c490829 files/digest-blas-atlas-3.6.0-r1 515 +MD5 8677e85d89d21e4f7c2826ba5a17d01e files/digest-blas-atlas-3.7.10 140 +RMD160 b31ab636dca54b465584936f9c63026a353a165f files/digest-blas-atlas-3.7.10 140 +SHA256 d0364995847e02cd4f1aeadd845d38194cbd604924b0b2835ccbcab3377d23d0 files/digest-blas-atlas-3.7.10 140 +MD5 37b8d5b760fea3fb4ac109827445d08a files/digest-blas-atlas-3.7.11 518 +RMD160 ca1ad7171082b3816b737a38ee424c2807aa58dd files/digest-blas-atlas-3.7.11 518 +SHA256 ad9eab1be32337d9023c9ff0d0a9b56379512de44fc5ab015831eb9e3986d52c files/digest-blas-atlas-3.7.11 518 diff --git a/sci-libs/blas-atlas/blas-atlas-3.6.0-r1.ebuild b/sci-libs/blas-atlas/blas-atlas-3.6.0-r1.ebuild index 958d26363720..09312f1962c6 100644 --- a/sci-libs/blas-atlas/blas-atlas-3.6.0-r1.ebuild +++ b/sci-libs/blas-atlas/blas-atlas-3.6.0-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/blas-atlas/blas-atlas-3.6.0-r1.ebuild,v 1.10 2006/05/23 20:13:19 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.6.0-r1.ebuild,v 1.11 2006/06/17 00:34:47 lu_zero Exp $ inherit eutils toolchain-funcs @@ -44,6 +44,7 @@ src_unpack() { epatch ${FILESDIR}/unbuffered.patch epatch ${DISTDIR}/atlas3.6.0-shared-libs.1.patch.bz2 + epatch ${FILESDIR}/${PV}-ppc-configure.patch 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 diff --git a/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild b/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild index 19c08779d27f..abd1e073bed6 100644 --- a/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild +++ b/sci-libs/blas-atlas/blas-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/blas-atlas/blas-atlas-3.7.11.ebuild,v 1.6 2006/04/01 19:59:07 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/blas-atlas/blas-atlas-3.7.11.ebuild,v 1.7 2006/06/17 00:34:47 lu_zero Exp $ inherit eutils toolchain-funcs fortran @@ -33,6 +33,7 @@ src_unpack() { epatch "${FILESDIR}"/unbuffered.patch epatch "${FILESDIR}"/${PV}-allow-any-gcc-version.patch epatch "${DISTDIR}"/atlas3.6.0-shared-libs.1.patch.bz2 + epatch "${FILESDIR}"/${PV}-ppc-configure.patch sed -i \ -e "s:ASM:ASM VOLATILE:" \ include/contrib/camm_dpa.h \ diff --git a/sci-libs/blas-atlas/files/3.6.0-ppc-configure.patch b/sci-libs/blas-atlas/files/3.6.0-ppc-configure.patch new file mode 100644 index 000000000000..c499cd0aaebd --- /dev/null +++ b/sci-libs/blas-atlas/files/3.6.0-ppc-configure.patch @@ -0,0 +1,10 @@ +--- ATLAS/config.c.old 2006-06-17 01:57:32.000000000 +0200 ++++ ATLAS/config.c 2006-06-17 01:55:45.000000000 +0200 +@@ -2877,6 +2877,7 @@ + else if (strstr(ln2, "7400")) mach = PPCG4; + else if (strstr(ln2, "7410")) mach = PPCG4; + else if (strstr(ln2, "7455")) mach = PPCG4; ++ else if (strstr(ln2, "altivec")) mach = PPCG4; + } + break; + case LASPARC: /* don't know here anymore */ diff --git a/sci-libs/blas-atlas/files/3.7.11-ppc-configure.patch b/sci-libs/blas-atlas/files/3.7.11-ppc-configure.patch new file mode 100644 index 000000000000..6ab7d2ace503 --- /dev/null +++ b/sci-libs/blas-atlas/files/3.7.11-ppc-configure.patch @@ -0,0 +1,10 @@ +--- /var/tmp/portage/blas-atlas-3.7.11/work/ATLAS/config.c.orig 2006-06-13 18:26:29.000000000 +0200 ++++ /var/tmp/portage/blas-atlas-3.7.11/work/ATLAS/config.c 2006-06-13 20:23:47.000000000 +0200 +@@ -3088,6 +3088,7 @@ + else if (strstr(ln2, "7410")) mach = PPCG4; + else if (strstr(ln2, "7455")) mach = PPCG4; + else if (strstr(ln2, "PPC970FX")) mach = PPCG5; ++ else if (strstr(ln2, "altivec") && !Use64Bits) mach = PPCG4; + } + break; + case LASPARC: /* don't know here anymore */