Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv29920/10.4/stable/main/finkinfo/sci
Modified Files:
octave-10.5-3.2.4.info octave-10.5-3.4.3.info
octave-3.2.4.info octave-3.4.3.info
Log Message:
Octave-3.4.3 doesn't use external ARPACK after all. It
also needed to have some .la files moved into the -dev
splitoff.
Octave-3.2.4 uses an external ARPACK.
Index: octave-10.5-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/octave-10.5-3.2.4.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- octave-10.5-3.2.4.info 25 Nov 2011 19:38:12 -0000 1.6
+++ octave-10.5-3.2.4.info 17 Dec 2011 13:16:04 -0000 1.7
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]%type_pkg[-x11]
Type: -atlas (boolean), oct(3.2.4), gcc (4.6), -x11 (boolean)
Version: 3.2.4
-Revision: 1004
+Revision: 1005
Distribution: 10.5
#atlas-only on x86_64
Architecture: (%type_raw[-atlas] != -atlas) i386, (%type_raw[-atlas] !=
-atlas) powerpc
@@ -28,10 +28,10 @@
(%type_raw[-x11] = -x11) fltk-x11,
(%type_raw[-x11] = -x11) x11-dev,
(%type_raw[-atlas] != -atlas) qrupdate (>=1.1.1-5),
- (%type_raw[-atlas] != -atlas) arpack (>= 96patched-6),
+ (%type_raw[-atlas] != -atlas) arpack-ng (>= 3.0.1-2),
(%type_raw[-atlas] = -atlas) atlas (>= 3.8.1-1),
(%type_raw[-atlas] = -atlas) qrupdate-atlas (>=1.1.1-5),
- (%type_raw[-atlas] = -atlas) arpack-atlas (>= 96patched-6)
+ (%type_raw[-atlas] = -atlas) arpack-ng-atlas (>= 3.0.1-2)
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas]%type_pkg[-x11] (=%v-%r)
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev,
imagemagick10-dev
@@ -177,18 +177,29 @@
InfoTest: <<
TestScript: <<
- # doesn't work anywhere
+ #!/bin/sh -ev
+ # doesn't work on any OS X
mv scripts/image/imread.m scripts/image/imread.m.testfails
- # doesn't work on 10.6/i386
- mv src/ov-struct.cc src/ov-struct.cc.testfails
- mv scripts/miscellaneous/setfield.m
scripts/miscellaneous.m.testfails
- # doesn't work on 10.6/i386/atlas:
- mv scripts/linear-algebra/onenormest.m
scripts/linear-algebra/onenormest.m.testfails
+ if [ "%m" = "i386" ]
+ then
+ # these don't work on i386
+ mv src/ov-struct.cc src/ov-struct.cc.testfails
+ mv scripts/miscellaneous/setfield.m
scripts/miscellaneous.m.testfails
+ if [ "%type_raw[-atlas]" = "-atlas" ]
+ # this doesn't work on i386/atlas:
+ then mv scripts/linear-algebra/onenormest.m
scripts/linear-algebra/onenormest.m.testfails
+ fi
+ fi
make check || exit 2
- mv scripts/image/imread.m.testfails scripts/image/imread.m
- mv src/ov-struct.cc.testfails src/ov-struct.cc
- mv scripts/miscellaneous/setfield.m.testfails
scripts/miscellaneous.m
- mv scripts/linear-algebra/onenormest.m.testfails
scripts/linear-algebra/onenormest.m
+ if [ "%m" = "i386" ]
+ then
+ mv scripts/image/imread.m.testfails
scripts/image/imread.m
+ mv src/ov-struct.cc.testfails src/ov-struct.cc
+ mv scripts/miscellaneous/setfield.m.testfails
scripts/miscellaneous.m
+ if [ "%type_raw[-atlas]" = "-atlas" ]
+ then mv
scripts/linear-algebra/onenormest.m.testfails
scripts/linear-algebra/onenormest.m
+ fi
+ fi
<<
<<
@@ -390,9 +401,9 @@
qhull5-shlibs,
(%type_raw[-x11] != -x11) fltk13-aqua-shlibs,
(%type_raw[-x11] = -x11) fltk-x11-shlibs,
- (%type_raw[-atlas] != -atlas) arpack-shlibs (>= 96patched-6),
+ (%type_raw[-atlas] != -atlas) arpack-ng-shlibs (>= 3.0.1-2),
(%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1),
- (%type_raw[-atlas] = -atlas) arpack-atlas-shlibs (>= 96patched-6)
+ (%type_raw[-atlas] = -atlas) arpack-ng-atlas-shlibs (>= 3.0.1-2)
<<
Conflicts: <<
%{Ni}%type_pkg[oct],
@@ -623,6 +634,8 @@
Due to issues with qhull6, use qhull5 instead.
Clean up octave-forge build scripts.
+
+As of revision 2005: switch to arpack-ng
<<
Homepage: http://www.octave.org/
License: GPL
Index: octave-10.5-3.4.3.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/octave-10.5-3.4.3.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- octave-10.5-3.4.3.info 16 Dec 2011 12:32:37 -0000 1.10
+++ octave-10.5-3.4.3.info 17 Dec 2011 13:16:04 -0000 1.11
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]%type_pkg[-x11]
Type: -atlas (boolean), oct(3.4.3), gcc (4.6), -x11 (boolean)
Version: 3.4.3
-Revision: 105
+Revision: 106
Distribution: 10.5
Architecture: (%type_raw[-atlas] != -atlas) powerpc, (%type_raw[-atlas] !=
-atlas) i386
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
@@ -175,9 +175,11 @@
InfoTest: <<
TestScript: <<
- mv scripts/linear-algebra/onenormest.m
scripts/linear-algebra/onenormest.m.testfails
- make check || exit 2
- mv scripts/linear-algebra/onenormest.m.testfails
scripts/linear-algebra/onenormest.m
+ #!/bin/sh -ev
+ if [ "%m" = "i386" -a "%type_raw[-atlas]" = "-atlas" ]
+ then printf "\n\t* Skipping tests on this platform.
*\n\n"
+ else make check || exit 2
+ fi
<<
<<
@@ -320,13 +322,13 @@
%{Ni}324-atlas-dev,
%{Ni}324-x11-dev,
%{Ni}324-atlas-x11-dev,
+ %{Ni}343 (<< 3.4.3-206),
%{Ni} (<< 3.0.5-5),
%{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5),
%{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
- Provides: <<
-
+ Provides: <<
liboctave%type_pkg[oct]-dev,
(%type_raw[-atlas] = -atlas) liboctave%type_pkg[oct]-atlas-dev,
(%type_raw[-atlas] != -atlas)
liboctave%type_pkg[oct]-veclib-dev,
@@ -338,6 +340,7 @@
Files: <<
include/%{Ni}-%v
+ lib/%{Ni}/%v/*.la
bin/mkoctfile*
bin/octave-config*
share/man/man1/mkoctfile*.1
@@ -377,10 +380,8 @@
readline5-shlibs,
(%type_raw[-x11] != -x11) fltk13-aqua-shlibs,
(%type_raw[-x11] = -x11) fltk-x11-shlibs,
- (%type_raw[-atlas] != -atlas) arpack-ng-shlibs (>=3.0.1-2),
(%type_raw[-atlas] != -atlas) qrupdate-shlibs,
(%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1),
- (%type_raw[-atlas] = -atlas) arpack-ng-atlas-shlibs (>=3.0.1-2),
(%type_raw[-atlas] = -atlas) qrupdate-atlas-shlibs
<<
Conflicts: <<
@@ -550,8 +551,8 @@
of the octave scripts during their build process and edit them to use the
package's name.
-The -atlas variant depends on -atlas variants (only) of qrupdate and
arpack-ng.
-The non-atlas variant depends on non-atlas variants (only) of these.
+The -atlas variant depends on -atlas variant (only) of qrupdate.
+The non-atlas variant depends on non-atlas variant (only) of this.
Patch oct-conf.h, and mkoctfile not to put "flag-sort -r" in the
name of the compiler used, and to use the full path of Fink's compiler
wrappers.
@@ -590,6 +591,13 @@
As of revision 106:
arpack-ng-atlas misbuilt prior to version 3.0.1-2
+
+As of revision 107:
+
+Package is actually using a bundled arpack--no configure flag
+to disable that.
+Move .la files into the -dev splitoff.
+Disable tests on i386 with atlas due to a known segfaulting issue.
<<
Homepage: http://www.octave.org/
License: GPL
Index: octave-3.2.4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/octave-3.2.4.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- octave-3.2.4.info 25 Nov 2011 19:38:12 -0000 1.8
+++ octave-3.2.4.info 17 Dec 2011 13:16:04 -0000 1.9
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]%type_pkg[-x11]
Type: -atlas (boolean), oct(3.2.4), gcc (4.6), -x11 (boolean)
Version: 3.2.4
-Revision: 2004
+Revision: 2005
Distribution: 10.6
#atlas-only on x86_64
Architecture: (%type_raw[-atlas] != -atlas) i386
@@ -28,10 +28,10 @@
(%type_raw[-x11] = -x11) fltk-x11,
(%type_raw[-x11] = -x11) x11-dev,
(%type_raw[-atlas] != -atlas) qrupdate (>=1.1.1-5),
- (%type_raw[-atlas] != -atlas) arpack (>= 96patched-6),
+ (%type_raw[-atlas] != -atlas) arpack-ng (>= 3.0.1-2),
(%type_raw[-atlas] = -atlas) atlas (>= 3.8.1-1),
(%type_raw[-atlas] = -atlas) qrupdate-atlas (>=1.1.1-5),
- (%type_raw[-atlas] = -atlas) arpack-atlas (>= 96patched-6)
+ (%type_raw[-atlas] = -atlas) arpack-ng-atlas (>= 3.0.1-2)
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas]%type_pkg[-x11] (=%v-%r)
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev,
imagemagick10-dev
@@ -175,18 +175,29 @@
InfoTest: <<
TestScript: <<
- # doesn't work anywhere
+ #!/bin/sh -ev
+ # doesn't work on any OS X
mv scripts/image/imread.m scripts/image/imread.m.testfails
- # doesn't work on 10.6/i386
- mv src/ov-struct.cc src/ov-struct.cc.testfails
- mv scripts/miscellaneous/setfield.m
scripts/miscellaneous.m.testfails
- # doesn't work on 10.6/i386/atlas:
- mv scripts/linear-algebra/onenormest.m
scripts/linear-algebra/onenormest.m.testfails
+ if [ "%m" = "i386" ]
+ then
+ # these don't work on i386
+ mv src/ov-struct.cc src/ov-struct.cc.testfails
+ mv scripts/miscellaneous/setfield.m
scripts/miscellaneous.m.testfails
+ if [ "%type_raw[-atlas]" = "-atlas" ]
+ # this doesn't work on i386/atlas:
+ then mv scripts/linear-algebra/onenormest.m
scripts/linear-algebra/onenormest.m.testfails
+ fi
+ fi
make check || exit 2
- mv scripts/image/imread.m.testfails scripts/image/imread.m
- mv src/ov-struct.cc.testfails src/ov-struct.cc
- mv scripts/miscellaneous/setfield.m.testfails
scripts/miscellaneous.m
- mv scripts/linear-algebra/onenormest.m.testfails
scripts/linear-algebra/onenormest.m
+ if [ "%m" = "i386" ]
+ then
+ mv scripts/image/imread.m.testfails
scripts/image/imread.m
+ mv src/ov-struct.cc.testfails src/ov-struct.cc
+ mv scripts/miscellaneous/setfield.m.testfails
scripts/miscellaneous.m
+ if [ "%type_raw[-atlas]" = "-atlas" ]
+ then mv
scripts/linear-algebra/onenormest.m.testfails
scripts/linear-algebra/onenormest.m
+ fi
+ fi
<<
<<
@@ -386,9 +397,9 @@
qhull5-shlibs,
(%type_raw[-x11] != -x11) fltk13-aqua-shlibs,
(%type_raw[-x11] = -x11) fltk-x11-shlibs,
- (%type_raw[-atlas] != -atlas) arpack-shlibs (>= 96patched-6),
+ (%type_raw[-atlas] != -atlas) arpack-ng-shlibs (>= 3.0.1-2),
(%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1),
- (%type_raw[-atlas] = -atlas) arpack-atlas-shlibs (>= 96patched-6)
+ (%type_raw[-atlas] = -atlas) arpack-ng-atlas-shlibs (>= 3.0.1-2)
<<
Conflicts: <<
%{Ni}%type_pkg[oct],
@@ -615,6 +626,8 @@
Due to issues with qhull6, use qhull5 instead.
Clean up octave-forge build scripts.
+
+As of revision 2005: switch to arpack-ng
<<
Homepage: http://www.octave.org/
License: GPL
Index: octave-3.4.3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/octave-3.4.3.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- octave-3.4.3.info 16 Dec 2011 12:32:37 -0000 1.9
+++ octave-3.4.3.info 17 Dec 2011 13:16:04 -0000 1.10
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]%type_pkg[-x11]
Type: -atlas (boolean), oct(3.4.3), gcc (4.6), -x11 (boolean)
Version: 3.4.3
-Revision: 205
+Revision: 206
Distribution: 10.6
Architecture: (%type_raw[-atlas] != -atlas) i386
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
@@ -172,9 +172,11 @@
InfoTest: <<
TestScript: <<
- mv scripts/linear-algebra/onenormest.m
scripts/linear-algebra/onenormest.m.testfails
- make check || exit 2
- mv scripts/linear-algebra/onenormest.m.testfails
scripts/linear-algebra/onenormest.m
+ #!/bin/sh -ev
+ if [ "%m" = "i386" -a "%type_raw[-atlas]" = "-atlas" ]
+ then printf "\n\t* Skipping tests on this platform.
*\n\n"
+ else make check || exit 2
+ fi
<<
<<
@@ -316,13 +318,13 @@
%{Ni}324-atlas-dev,
%{Ni}324-x11-dev,
%{Ni}324-atlas-x11-dev,
+ %{Ni}343 (<< 3.4.3-206),
%{Ni} (<< 3.0.5-5),
%{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5),
%{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
- Provides: <<
-
+ Provides: <<
liboctave%type_pkg[oct]-dev,
(%type_raw[-atlas] = -atlas) liboctave%type_pkg[oct]-atlas-dev,
(%type_raw[-atlas] != -atlas)
liboctave%type_pkg[oct]-veclib-dev,
@@ -334,6 +336,7 @@
Files: <<
include/%{Ni}-%v
+ lib/%{Ni}/%v/*.la
bin/mkoctfile*
bin/octave-config*
share/man/man1/mkoctfile*.1
@@ -373,10 +376,8 @@
readline5-shlibs,
(%type_raw[-x11] != -x11) fltk13-aqua-shlibs,
(%type_raw[-x11] = -x11) fltk-x11-shlibs,
- (%type_raw[-atlas] != -atlas) arpack-ng-shlibs (>=3.0.1-2),
(%type_raw[-atlas] != -atlas) qrupdate-shlibs,
(%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1),
- (%type_raw[-atlas] = -atlas) arpack-ng-atlas-shlibs (>=3.0.1-2),
(%type_raw[-atlas] = -atlas) qrupdate-atlas-shlibs
<<
Conflicts: <<
@@ -542,8 +543,8 @@
of the octave scripts during their build process and edit them to use the
package's name.
-The -atlas variant depends on -atlas variants (only) of qrupdate and arpack.
-The non-atlas variant depends on non-atlas variants (only) of these.
+The -atlas variant depends on -atlas variant (only) of qrupdate.
+The non-atlas variant depends on non-atlas variant (only) of this.
Patch oct-conf.h, and mkoctfile not to put "flag-sort -r" in the
name of the compiler used, and to use the full path of Fink's compiler
wrappers.
@@ -582,6 +583,13 @@
As of revision 206:
arpack-ng-atlas misbuilt prior to version 3.0.1-2
+
+As of revision 207:
+
+Package is actually using a bundled arpack--no configure flag
+to disable that.
+Move .la files into the -dev splitoff.
+Disable tests on i386 with atlas due to a known segfaulting issue.
<<
Homepage: http://www.octave.org/
License: GPL
------------------------------------------------------------------------------
Learn Windows Azure Live! Tuesday, Dec 13, 2011
Microsoft is holding a special Learn Windows Azure training event for
developers. It will provide a great way to learn Windows Azure and what it
provides. You can attend the event by watching it streamed LIVE online.
Learn more at http://p.sf.net/sfu/ms-windowsazure
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
