Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv5598
Modified Files:
atlas.info
Log Message:
should fix problems with uniprocessor machines and with 64-bit machines;
remain problems for some G4s
Index: atlas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/atlas.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- atlas.info 7 Nov 2007 04:30:26 -0000 1.7
+++ atlas.info 9 Nov 2007 16:47:53 -0000 1.8
@@ -1,7 +1,6 @@
-
Package: atlas
Version: 3.8.0
-Revision: 3
+Revision: 4
Description: Portably optimal linear algebra software
DescDetail: <<
The current version provides a complete BLAS and LAPACK API.
@@ -35,10 +34,14 @@
License: BSD
# since we're experimenting with building a dylib :
BuildDependsOnly: true
-BuildDepends: gcc42, fink (>= 0.27.99)
+BuildDepends: gcc42, fink (>= 0.27.9)
+## validator would like "fink (>= 0.27.99)", but then users complain.. Just
trying to get past the validator..
Depends: gcc42-shlibs
PatchScript: <<
#!/bin/sh -ev
+## some users have problems with "rm -f" on dirs ...
+# sed -i.bak -e '/rm -f \*\.o x\* config?\.out \*core\*/d' CONFIG/src/Makefile
+###
# -ftree-loop-linear causes problems with xconfig.
# -fgcse-after-reload -fsched-interblock -freorder-blocks also _ though
they're implied by -O3 !
cd ..; ln -s lapack-3.1.1 LAPACK
@@ -59,9 +62,11 @@
cd BLAS/SRC; make scabs1.o; cd -
mkdir -p ../bld/lib
ar cr ../bld/lib/libf77blas.a BLAS/SRC/scabs1.o; ar cr
../bld/lib/libptf77blas.a BLAS/SRC/scabs1.o
- cd ../bld
- ../ATLAS/configure --prefix=%p
--with-netlib-lapack=%b/../LAPACK/lapack_LINUX.a -v 2 \
- -C sk gcc-4 -C dk gcc-4 -C sm gcc-4 -C dm gcc-4 -C xc gcc-4 -C ic gcc-4
-F ic "$iflags" -F if "$iflags"
+ cd ..
+ ln -s %p/bin/gcc-4 gcc
+ export PATH=`pwd`:$PATH
+ cd bld
+ ../ATLAS/configure -v 2 --prefix=%p
--with-netlib-lapack=%b/../LAPACK/lapack_LINUX.a -b 32 -F ic "$iflags" -F if
"$iflags"
make
<<
InfoTest: <<
@@ -88,6 +93,16 @@
cp -pPR ../LAPACK/{html,COPYING,README} %i/share/doc/%n/LAPACK
ln -s html/index.html %i/share/doc/%n/LAPACK
cd ../bld/lib
+ # Apparently on some machines some of the threaded libs are not made;
+ # we first make atlas 'look the same' to all other pkgs, independently of the
machine
+ if test -f libptcblas.a
+ then for C in c f77; do
+ mv lib${C}blas.a lib${C}blas_unthreaded.a
+ ln -s libpt${C}blas.a lib${C}blas.a
+ done
+ else rm libptf77blas.a
+ for C in c f77; do ln -s lib${C}blas.a lib${C}blas_unthreaded.a;
done
+ fi
# we first make a shared lib; easier to just write the command here than to
fix lib/Makefile ...
# put this here to make sure it is after the testscript, else dylib might
affect timings.
# dylib just made to experiment; not sure this should stay.
@@ -97,15 +112,19 @@
# Is it the -all_load flag that causes the symbol "_main" from
libgfortranbegin.a to be loaded ?
###
# for now, we make an exported symbols list out of the external symbols of
liblapack, libptcblas and libptf77blas
- nm -mfg liblapack.a libptf77blas.a libptcblas.a|fgrep ' (__TEXT,__text)
external '|cut -f4 -d' ' > lst
+ nm -mfg liblapack.a libf77blas.a libcblas.a|fgrep ' (__TEXT,__text) external
'|cut -f4 -d' ' > lst
gfortran -dynamiclib -single_module -all_load -install_name
%p/lib/liblapack_atlas.dylib -o liblapack_atlas.dylib \
- liblapack.a libptf77blas.a libptcblas.a libatlas.a -Wl,-x -dead_strip
-exported_symbols_list lst -m
+ liblapack.a libf77blas.a libcblas.a libatlas.a -Wl,-x -dead_strip
-exported_symbols_list lst -m
# lib still has %p/lib/gcc4.2/lib/libgcc_s.1.dylib unnecessarily among its
load commands _
# don't know yet how to remove that cleanly (except by issuing the ld command
myself ..)
+#### changed the dylib's name from libatlas to something un-recognisable,
+#### to prevent octave linking with it, and becoming a different pkg
cd ..
make install DESTDIR=%i
ranlib %i/lib/*.a
- cp -p lib/*.dylib %i/lib
+ cp -p lib/*.{a,dylib} %i/lib
+ ranlib %i/lib/*.a
+ chmod -R a-x %i/lib
chmod -R a+rX %i/share
<<
Shlibs: !%p/lib/liblapack_%n.dylib
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
