r36360 - in /packages/atlas/trunk/debian: ./ patches/
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Fri Apr 9 16:31:35 UTC 2010
Author: sylvestre
Date: Fri Apr 9 16:31:31 2010
New Revision: 36360
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36360
Log:
* Fix a problem on the custom build (Closes: #576755)
* Some patches renamed to make sure of their order
* Fix a FTBFS under mips, hppa & alpha (Closes: #576891)
* Add conflicts on libblas{-dev} (<1.2-5) and liblapack{-dev} (<3.2.1-4)
to make sure that the update-alternatives mecanism can be used
(Closes: #576855)
* Fix a priority with 2.0 packages
Added:
packages/atlas/trunk/debian/patches/10_atlconf_1_s390.diff
- copied unchanged from r36349, packages/atlas/trunk/debian/patches/atlconf_1_s390.diff
packages/atlas/trunk/debian/patches/11_build_s390.diff
- copied unchanged from r36349, packages/atlas/trunk/debian/patches/build_s390.diff
packages/atlas/trunk/debian/patches/12_check-exists.diff
- copied unchanged from r36349, packages/atlas/trunk/debian/patches/check-exists.diff
packages/atlas/trunk/debian/patches/12_hurd.diff
- copied unchanged from r36349, packages/atlas/trunk/debian/patches/hurd.diff
packages/atlas/trunk/debian/patches/13_melf.diff
- copied unchanged from r36349, packages/atlas/trunk/debian/patches/melf.diff
packages/atlas/trunk/debian/patches/14_probe_s390.diff
- copied unchanged from r36349, packages/atlas/trunk/debian/patches/probe_s390.diff
packages/atlas/trunk/debian/patches/15_randomCrashOnBuild.diff
- copied unchanged from r36349, packages/atlas/trunk/debian/patches/randomCrashOnBuild.diff
packages/atlas/trunk/debian/patches/16_warning-removed.diff
- copied unchanged from r36349, packages/atlas/trunk/debian/patches/warning-removed.diff
packages/atlas/trunk/debian/patches/17_hppa.diff
packages/atlas/trunk/debian/patches/18_alpha.diff
packages/atlas/trunk/debian/patches/19_mips.diff
Removed:
packages/atlas/trunk/debian/patches/atlconf_1_s390.diff
packages/atlas/trunk/debian/patches/build_s390.diff
packages/atlas/trunk/debian/patches/check-exists.diff
packages/atlas/trunk/debian/patches/hurd.diff
packages/atlas/trunk/debian/patches/melf.diff
packages/atlas/trunk/debian/patches/probe_s390.diff
packages/atlas/trunk/debian/patches/randomCrashOnBuild.diff
packages/atlas/trunk/debian/patches/warning-removed.diff
Modified:
packages/atlas/trunk/debian/changelog
packages/atlas/trunk/debian/control
packages/atlas/trunk/debian/rules
Modified: packages/atlas/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/changelog?rev=36360&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Fri Apr 9 16:31:31 2010
@@ -1,8 +1,14 @@
atlas (3.8.3-20) unstable; urgency=low
+ * Fix a problem on the custom build (Closes: #576755)
+ * Some patches renamed to make sure of their order
+ * Fix a FTBFS under mips, hppa & alpha (Closes: #576891)
+ * Add conflicts on libblas{-dev} (<1.2-5) and liblapack{-dev} (<3.2.1-4)
+ to make sure that the update-alternatives mecanism can be used
+ (Closes: #576855)
* Fix a priority with 2.0 packages
- -- Sylvestre Ledru <sylvestre at debian.org> Wed, 07 Apr 2010 10:58:46 +0200
+ -- Sylvestre Ledru <sylvestre at debian.org> Thu, 08 Apr 2010 17:51:05 +0200
atlas (3.8.3-19) unstable; urgency=low
@@ -162,7 +168,7 @@
atlas (3.8.3-1) experimental; urgency=low
* New upstream version (Closes: #382880)
- * debian/rules rewrited from scratch
+ * debian/rules rewritten from scratch
* Provides more documentation in the libatlas-doc packages
* debian/copyright updated
* Add myself to the uploader
Modified: packages/atlas/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/control?rev=36360&op=diff
==============================================================================
--- packages/atlas/trunk/debian/control (original)
+++ packages/atlas/trunk/debian/control Fri Apr 9 16:31:31 2010
@@ -16,7 +16,7 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libatlas.so.3gf, libblas.so.3gf, liblapack.so.3gf
-Conflicts: atlas2 (<< 3.2.1-1)
+Conflicts: atlas2 (<< 3.2.1-1), libblas3gf (<< 1.2-5), liblapack3gf (<< 3.2.1-4)
Replaces: atlas2 (<< 3.2.1-1)
Suggests: ${libs:Suggests}, libblas3gf, liblapack3gf
Description: Automatically Tuned Linear Algebra Software, generic shared
@@ -41,9 +41,11 @@
Package: libatlas-base-dev
Section: libdevel
Architecture: any
-Depends: libatlas3gf-base (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
-Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-dev (<< 3.2.1-3), atlas2-base-dev
+Depends: libatlas3gf-base (= ${binary:Version}), libatlas-dev, ${misc:Depends},
+ ${shlibs:Depends}
+Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
+Conflicts: atlas2-dev (<< 3.2.1-3), atlas2-base-dev, libblas-dev (<< 1.2-5),
+ liblapack-dev (<< 3.2.1-4)
Replaces: atlas2-dev (<< 3.2.1-3), atlas2-base-dev
Suggests: libblas-doc, liblapack-doc
Description: Automatically Tuned Linear Algebra Software, generic static
@@ -60,7 +62,8 @@
Section: libdevel
Architecture: all
Depends: libc6-dev, libblas-dev, ${misc:Depends}, ${shlibs:Depends}
-Conflicts: atlas-dev, atlas2-dev (<< 3.2.1-3), atlas2-headers, atlas3-headers
+Conflicts: atlas-dev, atlas2-dev (<< 3.2.1-3), atlas2-headers, atlas3-headers,
+ libblas-dev (<< 1.2-5), liblapack-dev (<< 3.2.1-4)
Replaces: atlas2-dev (<< 3.2.1-3), atlas2-headers, atlas3-headers
Suggests: liblapack-dev, liblapack-doc
Description: Automatically Tuned Linear Algebra Software, C header files
@@ -112,6 +115,7 @@
Provides: libatlas.so.3gf, libblas.so.3gf, liblapack.so.3gf
Suggests: libatlas3gf-sse2, libblas3gf, liblapack3gf
Replaces: libatlas3gf-3dnow
+Conflicts: libblas3gf (<< 1.2-5), liblapack3gf (<< 3.2.1-4)
Description: Automatically Tuned Linear Algebra Software, SSE1 shared
ATLAS is an approach for the automatic generation and optimization of
numerical software. Currently ATLAS supplies optimized versions for the
@@ -136,7 +140,8 @@
Architecture: i386 kfreebsd-i386 hurd-i386 ia64
Depends: libatlas3gf-sse (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-sse-dev, atlas3-sse-dev
+Conflicts: atlas2-sse-dev, atlas3-sse-dev, libblas-dev (<< 1.2-5),
+ liblapack-dev (<< 3.2.1-4)
Replaces: atlas2-sse-dev, atlas4-sse-dev, libatlas-3dnow-dev
Suggests: libblas-doc, liblapack-doc
Description: Automatically Tuned Linear Algebra Software, SSE1 static
@@ -155,6 +160,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libatlas.so.3gf, libblas.so.3gf, liblapack.so.3gf
Suggests: libblas3gf, liblapack3gf
+Conflicts: libblas3gf (<< 1.2-5), liblapack3gf (<< 3.2.1-4)
Description: Automatically Tuned Linear Algebra Software, SSE2 shared
ATLAS is an approach for the automatic generation and optimization of
numerical software. Currently ATLAS supplies optimized versions for the
@@ -179,7 +185,8 @@
Architecture: i386 kfreebsd-i386 hurd-i386 ia64
Depends: libatlas3gf-sse2 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-sse2-dev, atlas3-sse2-dev
+Conflicts: atlas2-sse2-dev, atlas3-sse2-dev, libblas-dev (<< 1.2-5),
+ liblapack-dev (<< 3.2.1-4)
Replaces: atlas2-sse2-dev, atlas3-sse2-dev
Suggests: libblas-doc, liblapack-doc
Description: Automatically Tuned Linear Algebra Software, SSE2 static
@@ -198,6 +205,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libatlas.so.3gf, libblas.so.3gf, liblapack.so.3gf
Suggests: libblas3gf, liblapack3gf
+Conflicts: libblas3gf (<< 1.2-5), liblapack3gf (<< 3.2.1-4)
Description: Automatically Tuned Linear Algebra Software, SSE3 shared
ATLAS is an approach for the automatic generation and optimization of
numerical software. Currently ATLAS supplies optimized versions for the
@@ -222,7 +230,8 @@
Architecture: i386 kfreebsd-i386 hurd-i386
Depends: libatlas3gf-sse3 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-sse3-dev, atlas3-sse3-dev
+Conflicts: atlas2-sse3-dev, atlas3-sse3-dev, libblas-dev (<< 1.2-5),
+ liblapack-dev (<< 3.2.1-4)
Replaces: atlas2-sse3-dev, atlas3-sse3-dev
Suggests: libblas-doc, liblapack-doc
Description: Automatically Tuned Linear Algebra Software, SSE3 static
@@ -242,6 +251,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libatlas.so.3gf, libblas.so.3gf, liblapack.so.3gf
Suggests: libblas3gf, liblapack3gf
+Conflicts: libblas3gf (<< 1.2-5), liblapack3gf (<< 3.2.1-4)
Description: Automatically Tuned Linear Algebra Software, CORE2SSE3 shared
ATLAS is an approach for the automatic generation and optimization of
numerical software. Currently ATLAS supplies optimized versions for the
@@ -267,7 +277,8 @@
Architecture: i386 kfreebsd-i386 hurd-i386 amd64
Depends: libatlas3gf-core2sse3 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-sse2-dev, atlas3-sse2-dev
+Conflicts: atlas2-sse2-dev, atlas3-sse2-dev, libblas-dev (<< 1.2-5),
+ liblapack-dev (<< 3.2.1-4)
Replaces: atlas2-sse2-dev, atlas3-sse2-dev
Suggests: libblas-doc, liblapack-doc
Description: Automatically Tuned Linear Algebra Software, CORE2SSE3 static
@@ -287,6 +298,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libatlas.so.3gf, libblas.so.3gf, liblapack.so.3gf
Suggests: libblas3gf, liblapack3gf
+Conflicts: libblas3gf (<< 1.2-5), liblapack3gf (<< 3.2.1-4)
Description: Automatically Tuned Linear Algebra Software, AMD64SSE3 shared
ATLAS is an approach for the automatic generation and optimization of
numerical software. Currently ATLAS supplies optimized versions for the
@@ -311,7 +323,8 @@
Architecture: amd64
Depends: libatlas3gf-amd64sse3 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-sse2-dev, atlas3-sse2-dev
+Conflicts: atlas2-sse2-dev, atlas3-sse2-dev, libblas-dev (<< 1.2-5),
+ liblapack-dev (<< 3.2.1-4)
Replaces: atlas2-sse2-dev, atlas3-sse2-dev
Suggests: libblas-doc, liblapack-doc
Description: Automatically Tuned Linear Algebra Software, AMD64SSE3 static
@@ -330,6 +343,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libatlas.so.3gf, libblas.so.3gf, liblapack.so.3gf
Suggests: libblas3gf, liblapack3gf
+Conflicts: libblas3gf (<< 1.2-5), liblapack3gf (<< 3.2.1-4)
Description: Automatically Tuned Linear Algebra Software, COREI7SSE3 shared
ATLAS is an approach for the automatic generation and optimization of
numerical software. Currently ATLAS supplies optimized versions for the
@@ -355,7 +369,8 @@
Architecture: amd64
Depends: libatlas3gf-corei7sse3 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-sse2-dev, atlas3-sse2-dev
+Conflicts: atlas2-sse2-dev, atlas3-sse2-dev, libblas-dev (<< 1.2-5),
+ liblapack-dev (<< 3.2.1-4)
Replaces: atlas2-sse2-dev, atlas3-sse2-dev
Suggests: libblas-doc, liblapack-doc
Description: Automatically Tuned Linear Algebra Software, COREI7SSE3 static
@@ -374,6 +389,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libatlas.so.3gf, libblas.so.3gf, liblapack.so.3gf
Suggests: libblas3gf, liblapack3gf
+Conflicts: libblas3gf (<< 1.2-5), liblapack3gf (<< 3.2.1-4)
Description: Automatically Tuned Linear Algebra Software, altivec shared
ATLAS is an approach for the automatic generation and optimization of
numerical software. Currently ATLAS supplies optimized versions for the
@@ -398,7 +414,8 @@
Package: libatlas-altivec-dev
Section: libdevel
Architecture: powerpc
-Conflicts: atlas2-altivec-dev, atlas3-altivec-dev
+Conflicts: atlas2-altivec-dev, atlas3-altivec-dev, libblas-dev (<< 1.2-5),
+ liblapack-dev (<< 3.2.1-4)
Replaces: atlas2-altivec-dev, atlas3-altivec-dev
Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
Depends: libatlas3gf-altivec (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
@@ -419,6 +436,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libatlas.so.3gf, libblas.so.3gf, liblapack.so.3gf
Suggests: libblas3gf, liblapack3gf
+Conflicts: libblas3gf (<< 1.2-5), liblapack3gf (<< 3.2.1-4)
Description: Automatically Tuned Linear Algebra Software, v9 shared
ATLAS is an approach for the automatic generation and optimization of
numerical software. Currently ATLAS supplies optimized versions for the
@@ -441,7 +459,8 @@
Package: libatlas-v9-dev
Section: libdevel
Architecture: sparc
-Conflicts: atlas2-v9-dev, atlas3-v9-dev
+Conflicts: atlas2-v9-dev, atlas3-v9-dev, libblas-dev (<< 1.2-5),
+ liblapack-dev (<< 3.2.1-4)
Replaces: atlas2-v9-dev, atlas3-v9-dev
Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
Depends: libatlas3gf-v9 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
@@ -463,6 +482,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libatlas.so.3gf, libblas.so.3gf, liblapack.so.3gf
Suggests: libblas3gf, liblapack3gf
+Conflicts: libblas3gf (<< 1.2-5), liblapack3gf (<< 3.2.1-4)
Description: Automatically Tuned Linear Algebra Software, EV6 shared
ATLAS is an approach for the automatic generation and optimization of
numerical software. Currently ATLAS supplies optimized versions for the
@@ -486,10 +506,12 @@
Package: libatlas-ev6-dev
Section: libdevel
Architecture: alpha
-Conflicts: atlas2-ev6-dev, atlas3-ev6-dev
+Conflicts: atlas2-ev6-dev, atlas3-ev6-dev, libblas-dev (<< 1.2-5),
+ liblapack-dev (<< 3.2.1-4)
Replaces: atlas2-ev6-dev, atlas3-ev6-dev
Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Depends: libatlas3gf-ev6 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
+Depends: libatlas3gf-ev6 (= ${binary:Version}), libatlas-dev, ${misc:Depends},
+ ${shlibs:Depends}
Suggests: libblas-doc, liblapack-doc
Description: Automatically Tuned Linear Algebra Software, EV6 static
ATLAS is an approach for the automatic generation and optimization of
@@ -507,6 +529,7 @@
Depends: ${shlibs:Depends}, ${misc:Depends}
Provides: libatlas.so.3gf, libblas.so.3gf, liblapack.so.3gf
Suggests: libblas3gf, liblapack3gf
+Conflicts: libblas3gf (<< 1.2-5), liblapack3gf (<< 3.2.1-4)
Description: Automatically Tuned Linear Algebra Software, 2.0 shared
ATLAS is an approach for the automatic generation and optimization of
numerical software. Currently ATLAS supplies optimized versions for the
@@ -529,7 +552,8 @@
Package: libatlas-2.0-dev
Section: libdevel
Architecture: hppa
-Conflicts: atlas2-2.0-dev, atlas3-2.0-dev
+Conflicts: atlas2-2.0-dev, atlas3-2.0-dev, libblas-dev (<< 1.2-5),
+ liblapack-dev (<< 3.2.1-4)
Replaces: atlas2-2.0-dev, atlas3-2.0-dev
Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
Depends: libatlas3gf-2.0 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
Added: packages/atlas/trunk/debian/patches/17_hppa.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/patches/17_hppa.diff?rev=36360&op=file
==============================================================================
--- packages/atlas/trunk/debian/patches/17_hppa.diff (added)
+++ packages/atlas/trunk/debian/patches/17_hppa.diff Fri Apr 9 16:31:31 2010
@@ -1,0 +1,41 @@
+diff -ur atlas-3.8.3.orig/CONFIG//include/atlconf.h atlas-3.8.3/CONFIG//include/atlconf.h
+--- atlas-3.8.3.orig/CONFIG//include/atlconf.h 2010-04-08 15:40:16.000000000 +0000
++++ atlas-3.8.3/CONFIG//include/atlconf.h 2010-04-08 14:34:46.000000000 +0000
+@@ -49,6 +49,13 @@
+ #define MachIsS390(mach_) \
+ ( 0 )
+ #endif
++#ifdef __hppa__
++#define MachIsHPPA(mach_) \
++ ( __hppa__ )
++#else
++#define MachIsHPPA(mach_) \
++ ( 0 )
++#endif
+
+ static char *f2c_namestr[5] = {"UNKNOWN","Add_", "Add__", "NoChange", "UpCase"};
+ static char *f2c_intstr[5] =
+diff -ur atlas-3.8.3.orig/CONFIG//src/probe_comp.c atlas-3.8.3/CONFIG//src/probe_comp.c
+--- atlas-3.8.3.orig/CONFIG//src/probe_comp.c 2010-04-08 15:40:17.000000000 +0000
++++ atlas-3.8.3/CONFIG//src/probe_comp.c 2010-04-08 14:38:01.000000000 +0000
+@@ -512,6 +512,8 @@
+ return(sp);
+ if (MachIsS390(arch))
+ return(sp);
++ if (MachIsHPPA(arch))
++ return(sp);
+ if (MachIsMIPS(arch))
+ return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
+ if (!CompIsGcc(comp))
+diff -ur atlas-3.8.3.orig/CONFIG//src/SpewMakeInc.c atlas-3.8.3/CONFIG//src/SpewMakeInc.c
+--- atlas-3.8.3.orig/CONFIG//src/SpewMakeInc.c 2010-04-08 15:40:18.000000000 +0000
++++ atlas-3.8.3/CONFIG//src/SpewMakeInc.c 2010-04-08 14:38:43.000000000 +0000
+@@ -342,6 +342,8 @@
+ return(sp);
+ if (MachIsS390(arch))
+ return(sp);
++ if (MachIsHPPA(arch))
++ return(sp);
+ if (MachIsMIPS(arch))
+ return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
+ if (!CompIsGcc(comp))
Added: packages/atlas/trunk/debian/patches/18_alpha.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/patches/18_alpha.diff?rev=36360&op=file
==============================================================================
--- packages/atlas/trunk/debian/patches/18_alpha.diff (added)
+++ packages/atlas/trunk/debian/patches/18_alpha.diff Fri Apr 9 16:31:31 2010
@@ -1,0 +1,44 @@
+diff -ur atlas-3.8.3.orig/CONFIG//include/atlconf.h atlas-3.8.3/CONFIG//include/atlconf.h
+--- atlas-3.8.3.orig/CONFIG//include/atlconf.h 2010-04-08 15:48:00.000000000 +0000
++++ atlas-3.8.3/CONFIG//include/atlconf.h 2010-04-08 15:50:11.000000000 +0000
+@@ -56,6 +56,13 @@
+ #define MachIsHPPA(mach_) \
+ ( 0 )
+ #endif
++#ifdef __alpha__
++#define MachIsALPHA(mach_) \
++ ( __alpha__ )
++#else
++#define MachIsALPHA(mach_) \
++ ( 0 )
++#endif
+
+ static char *f2c_namestr[5] = {"UNKNOWN","Add_", "Add__", "NoChange", "UpCase"};
+ static char *f2c_intstr[5] =
+Seulement dans atlas-3.8.3/CONFIG//include: atlconf.h~
+diff -ur atlas-3.8.3.orig/CONFIG//src/probe_comp.c atlas-3.8.3/CONFIG//src/probe_comp.c
+--- atlas-3.8.3.orig/CONFIG//src/probe_comp.c 2010-04-08 15:48:00.000000000 +0000
++++ atlas-3.8.3/CONFIG//src/probe_comp.c 2010-04-08 15:49:57.000000000 +0000
+@@ -514,6 +514,8 @@
+ return(sp);
+ if (MachIsHPPA(arch))
+ return(sp);
++ if (MachIsALPHA(arch))
++ return(sp);
+ if (MachIsMIPS(arch))
+ return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
+ if (!CompIsGcc(comp))
+Seulement dans atlas-3.8.3/CONFIG//src: probe_comp.c~
+diff -ur atlas-3.8.3.orig/CONFIG//src/SpewMakeInc.c atlas-3.8.3/CONFIG//src/SpewMakeInc.c
+--- atlas-3.8.3.orig/CONFIG//src/SpewMakeInc.c 2010-04-08 15:48:00.000000000 +0000
++++ atlas-3.8.3/CONFIG//src/SpewMakeInc.c 2010-04-08 15:49:48.000000000 +0000
+@@ -344,6 +344,8 @@
+ return(sp);
+ if (MachIsHPPA(arch))
+ return(sp);
++ if (MachIsALPHA(arch))
++ return(sp);
+ if (MachIsMIPS(arch))
+ return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
+ if (!CompIsGcc(comp))
+Seulement dans atlas-3.8.3/CONFIG//src: SpewMakeInc.c~
Added: packages/atlas/trunk/debian/patches/19_mips.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/patches/19_mips.diff?rev=36360&op=file
==============================================================================
--- packages/atlas/trunk/debian/patches/19_mips.diff (added)
+++ packages/atlas/trunk/debian/patches/19_mips.diff Fri Apr 9 16:31:31 2010
@@ -1,0 +1,19 @@
+Index: atlas-3.8.3/CONFIG/include/atlconf.h
+===================================================================
+--- atlas-3.8.3.orig/CONFIG/include/atlconf.h 2010-04-09 10:26:06.000000000 +0200
++++ atlas-3.8.3/CONFIG/include/atlconf.h 2010-04-09 11:08:21.000000000 +0200
+@@ -38,8 +38,13 @@
+ ( (mach_) >= IA64Itan && (mach_) <= IA64Itan2 )
+ #define MachIsUS(mach_) \
+ ( (mach_) >= SunUSI && (mach_) <= SunUSX )
++#ifdef __mips__
+ #define MachIsMIPS(mach_) \
+- ( (mach_) >= MIPSR1xK && (mach_) <= MIPSICE9 )
++ ( ((mach_) >= MIPSR1xK && (mach_) <= MIPSICE9) || __mips__ )
++#else
++#define MachIsMIPS(mach_) \
++ ( ((mach_) >= MIPSR1xK && (mach_) <= MIPSICE9) )
++#endif
+ #define MachIsPPC(mach_) \
+ ( (mach_) >= PPCG4 && (mach_) <= PPCG5 )
+ #ifdef __s390__
Modified: packages/atlas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/rules?rev=36360&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/trunk/debian/rules Fri Apr 9 16:31:31 2010
@@ -112,9 +112,9 @@
ncpu=$$(LANG=C cpufreq-info | grep "analyzing CPU" -c); \
for (( cpu=0 ; cpu < $$ncpu ; cpu++)); do \
- if test $$(cpufreq-info -p; echo $$?) -eq 0 -a -z "$$(LANG=C cpufreq-info -p -c $$cpu | grep performance)" ; then \
+ if test $$(cpufreq-info -p 2>&1 > /dev/null; echo $$?) -eq 0 -a -z "$$(LANG=C cpufreq-info -p -c $$cpu | grep performance)" ; then \
echo "frequency governor on cpu=$$cpu is not set to 'performance'"; \
- echo "run: 'sudo cpufreq-set -g governor -c cpu#' for each cpu"; \
+ echo "run: 'sudo cpufreq-set -g performance -c cpu#' for each cpu"; \
echo "aborting atlas build"; \
exit 1; \
fi; \
More information about the debian-science-commits
mailing list