Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv23967/10.7/stable/main/finkinfo/sci
Modified Files:
mkoctfile-gcc.info octave-3.0.5.info octave-3.2.4.info
Log Message:
Update mkoctfile and mkoctfile-gcc46 to include the BLAS C library from
ATLAS.
Index: octave-3.0.5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.0.5.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- octave-3.0.5.info 12 Sep 2011 18:17:42 -0000 1.18
+++ octave-3.0.5.info 13 Sep 2011 00:01:20 -0000 1.19
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (.), oct(3.0.5)
Version: 3.0.5
-Revision: 17
+Revision: 21
Maintainer: Alexander Hansen <[email protected]>
# disable atlas on 10.7 distro file until atlas is available
@@ -104,6 +104,9 @@
sed -i.bak -e 's|flag-sort -r gcc|@WHICH_CC@|g' \
-e 's|flag-sort -r g++|@WHICH_CXX@|g' \
%i/include/%{Ni}-%v/%{Ni}/oct-conf.h %i/bin/%{Ni}-bug-%v
+ # for the -atlas variant, add libcblas.dylib to BLAS_LIBS:
+ perl -pi -e 's|(%p/lib/liblapack.dylib %p/lib/libf77blas.dylib)|$1
%p/lib/libcblas.dylib|' \
+ %i/bin/mkoctfile %i/include/%{ni}-%v/%{ni}/oct-conf.h %i/bin/%{ni}-bug-%v
<<
InfoDocs: %{Ni}.info
RuntimeVars: <<
Index: octave-3.2.4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/octave-3.2.4.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- octave-3.2.4.info 12 Sep 2011 18:17:42 -0000 1.18
+++ octave-3.2.4.info 13 Sep 2011 00:01:20 -0000 1.19
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (.), oct(3.2.4)
Version: 3.2.4
-Revision: 12
+Revision: 21
Maintainer: Alexander Hansen <[email protected]>
# disable atlas on 10.7 distro file until atlas is available
@@ -136,6 +136,9 @@
sed -i.bak -e 's|flag-sort -r gcc|@WHICH_CC@|g' \
-e 's|flag-sort -r g++|@WHICH_CXX@|g' \
%i/include/%{Ni}-%v/%{Ni}/oct-conf.h %i/bin/%{Ni}-bug-%v
+ # for the -atlas variant, add libcblas.dylib to BLAS_LIBS:
+ perl -pi -e 's|(%p/lib/liblapack.dylib %p/lib/libf77blas.dylib)|$1
%p/lib/libcblas.dylib|' \
+ %i/bin/mkoctfile %i/include/%{ni}-%v/%{ni}/oct-conf.h %i/bin/%{ni}-bug-%v
<<
InfoDocs: %{Ni}.info
RuntimeVars: <<
Index: mkoctfile-gcc.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/mkoctfile-gcc.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mkoctfile-gcc.info 12 Sep 2011 18:17:42 -0000 1.5
+++ mkoctfile-gcc.info 13 Sep 2011 00:01:20 -0000 1.6
@@ -2,7 +2,7 @@
Package: mkoctfile%type_pkg[oct]-gcc%type_pkg[gcc]%type_pkg[-atlas]
Type: gcc (4.6), oct(3.0.5 3.2.4), -atlas(.), nosource
-Version: 1.0.1
+Version: 1.0.3
Revision: 1
Description: Octave build tools using gcc%type_pkg[gcc]
@@ -26,7 +26,7 @@
Maintainer: Alexander Hansen <[email protected]>
License: BSD
-BuildDepends: octave%type_pkg[oct]%type_pkg[-atlas]-dev
+BuildDepends: octave%type_pkg[oct]%type_pkg[-atlas]-dev (>= %type_raw[oct]-21)
Depends: gcc%type_pkg[gcc]-compiler
Conflicts: mkoctfile%type_pkg[oct]-gcc%type_pkg[gcc],
mkoctfile%type_pkg[oct]-gcc%type_pkg[gcc]-atlas
Replaces: mkoctfile%type_pkg[oct]-gcc%type_pkg[gcc],
mkoctfile%type_pkg[oct]-gcc%type_pkg[gcc]-atlas
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
Learn about the latest advances in developing for the
BlackBerry® mobile platform with sessions, labs & more.
See new tools and technologies. Register for BlackBerry® DevCon today!
http://p.sf.net/sfu/rim-devcon-copy1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
