Update of /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv22377
Modified Files:
atlas.info
Log Message:
Cleanup. Still issues to clarify (G4, -fPIC..)
Index: atlas.info
===================================================================
RCS file: /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/atlas.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- atlas.info 26 Nov 2007 02:24:52 -0000 1.9
+++ atlas.info 23 Dec 2007 23:01:03 -0000 1.10
@@ -1,6 +1,6 @@
Package: atlas
Version: 3.8.0
-Revision: 5
+Revision: 6
Description: Portably optimal linear algebra software
DescDetail: <<
The current version provides a complete BLAS and LAPACK API.
@@ -37,15 +37,9 @@
License: BSD
# since we're experimenting with building a dylib :
BuildDependsOnly: true
-BuildDepends: gcc42, fink (>= 0.27.99)
-## validator would like "fink (>= 0.27.99)", but then users complain.. Just
trying to get past the validator..
-Depends: gcc42-shlibs
+BuildDepends: gcc42
PatchScript: <<
#!/bin/sh -ev
-# -ftree-loop-linear causes problems with xconfig.
-# -fgcse-after-reload -fsched-interblock -freorder-blocks also _ though
they're implied by -O3 !
-## Try this : (no: archinfo_linux doesn't seem to be used)
-#perl -pi -e 's,7455,7450,' ATLAS/CONFIG/src/backend/archinfo_linux.c
## Try this (doesn't come out well with /usr/bin/sed, which doesn't respect
initial spacing, but OK anyway):
## Update according to http://www.cocoadev.com/index.pl?MacintoshModels (or
any better source...)
## might be more reliable, once one knows one is in a Apple-ppc type machine,
to call `machine` ..
@@ -65,17 +59,16 @@
CONFIG/src/backend/archinfo_freebsd.c
cd ..; ln -s lapack-3.1.1 LAPACK
cd LAPACK
-sed -e 's|g77|gfortran|g' < INSTALL/make.inc.LINUX > make.inc
-perl -pi -e 's,\.\./\.\./blas\$\(PLAT\)\.a,%b/../bld/lib/libptf77blas.a
%b/../bld/lib/libptcblas.a %b/../bld/lib/libatlas.a,' \
- make.inc
+sed -e 's,\.\./\.\./blas\$(PLAT)\.a,%b/../bld/lib/libptf77blas.a
%b/../bld/lib/libptcblas.a %b/../bld/lib/libatlas.a,' \
+ -e 's|g77|gfortran|g' -e 's,^TIMER,\#TIMER,' -e '/INT_ETIME/s,^\# *,,' <
INSTALL/make.inc.LINUX > make.inc
<<
CompileScript: <<
#!/bin/sh -ev
if [ %m = 'i386' ]; then mflags="-mfpmath=sse -msse -msse2 -msse3 -m32";
iflags="-mfpmath=387"; else mflags=''; iflags=''; fi
- lflags="-O3 -fomit-frame-pointer -fgcse-sm -fgcse-las -ftree-loop-linear
$mflags"
- iflags="-O3 -fomit-frame-pointer $iflags"
+ lflags="-fPIC -O3 -fomit-frame-pointer -fgcse-sm -fgcse-las
-ftree-loop-linear $mflags"
+ iflags="-fPIC -O3 -fomit-frame-pointer $iflags"
cd ../LAPACK
- sed -i.bak -e "s;\(-funroll-all-loops\) -O3;\1 $lflags;" -e
's,^TIMER,\#TIMER,' -e '/INT_ETIME/s,^\# *,,' make.inc
+ sed -i.bak -e "s;\(-funroll-all-loops\) -O3;\1 $lflags;" make.inc
make lapacklib
# atlas 'forgets' scabs1 (not dcabs1 !), so we get it here..
cd BLAS/SRC; make scabs1.o; cd -
@@ -89,6 +82,33 @@
# m=`machine`; if test $m = ppc7400 -o $m = ppc7450 ; then \
# sed -i.bak -e 's,^\( *ARCH =\).*,\1 PPCG432AltiVec,' -e 's,ARCHDEFS =,&
-DATL_AVgcc' Make.inc ; fi
make
+ cd lib
+ # Apparently on some machines (=monoprocesors ?) 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 # This is then the embryo we created
with scabs1 above
+ for C in c f77; do ln -s lib${C}blas.a lib${C}blas_unthreaded.a;
done
+ fi
+ # We now make shared libs (experimental); easier to just write the commands
here than to fix lib/Makefile ...
+ # We link 'manually', with ld, to avoid having unnecessary libs like lgcc_s
among the load commands.
+ # This way the libs can be safely used in linking with any compiler: they
will not bring themselves
+ # the wrong lgcc_s in the search list.
+ ld="ld -dynamic -dylib -single_module -dead_strip -x -all_load -L.
-L%p/lib/gcc4.2/lib -dylib_install_name"
+ $ld %p/lib/libatlas.dylib libatlas.a -o libatlas.dylib -lSystem -ldylib1.o
+ $ld %p/lib/libcblas.dylib libcblas.a -o libcblas.dylib -latlas -lSystem
-ldylib1.o
+ $ld %p/lib/libf77blas.dylib libf77blas.a -o libf77blas.dylib -lgfortran
-latlas -lSystem -ldylib1.o
+ $ld %p/lib/liblapack.dylib liblapack.a -o liblapack.dylib -lf77blas
-lgfortran -lcblas -latlas -lSystem -ldylib1.o
+ ## the next 4 lines are optional _ no idea of a correct exported symbols list
for libatlas...
+ ## probably to be removed for a commit _ it gains an enormous decrease in the
# of symbols exported by the lib,
+ ## but size goes down only from ~ 2.8M to 2.3M
+ # nm -mfgu liblapack.dylib libcblas.dylib libf77blas.dylib|fgrep ' (from
libatlas'|sed -e 's, (from .*,,' -e 's,.* ,,'|sort -u > l$
+ # install_name_tool -id %p/lib/libatlas_full.dylib libatlas.dylib
+ # mv libatlas.dylib libatlas_full.dylib
+ # $ld %p/lib/libatlas.dylib libatlas.a -o libatlas.dylib -ldylib1.o -lSystem
-exported_symbols_list lst
<<
InfoTest: <<
TestScript: <<
@@ -113,43 +133,7 @@
cp -pPR ../LAPACK/manpages/{blas/,}man %i/share
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 now make shared libs (experimental); 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.
- # When linking with gfortran, he '-m' flag at the end is dirty trick to get
around an "undefined symbol" for _MAIN__, from -lgfortranbegin;
- # _ it swallows the immediately following -lgfortranbegin in the command
transmitted to /usr/bin/libtool ...
- # There are no undefined symbols w/o "from ..." in the resulting dylib.
- # Is it the -all_load flag that causes the symbol "_main" from
libgfortranbegin.a to be loaded ?
- # In fact we link even lf77blas and llapack with gcc, adding explicitly
-lgfortran,
- # because this removes from the load commands the unnecessary
%p/lib/gcc4.2/lib/libgcc_s.1.dylib,
- # and also removes "-macosx_version_min 10.3" from the link line.
- ## In fact, this doesn't ! (maybe because we changed gcc to cc in the
commands below ?
- ## only change I remember ..) _ At worst we'll have to link with ld .. (as
in the Makefile :) )
- ## let us first try once more with gcc instead of cc (though I'd prefer to
use cc here, since it is the interface with other pkgs)
- flags="-dynamiclib -single_module -Wl,-x -dead_strip -all_load -install_name"
- if test `uname -r|sed -e 's,\..*,,'` -ge 9; then flags="-dead_strip_dylibs
$flags"; fi
- gcc $flags %p/lib/libatlas.dylib -o libatlas.dylib libatlas.a
- gcc $flags %p/lib/libcblas.dylib -o libcblas.dylib libcblas.a libatlas.dylib
- gcc $flags %p/lib/libf77blas.dylib -o libf77blas.dylib libf77blas.a
libatlas.dylib -L%p/lib/gcc4.2/lib -lgfortran
- gcc $flags %p/lib/liblapack.dylib -o liblapack.dylib liblapack.a
libcblas.dylib libf77blas.dylib libatlas.dylib -L%p/lib/gcc4.2/lib -lgfortran
- #### the rest is optional _ no idea of a correct exported symbols list for
libatlas...
- #### probably to be removed for a commit _ it gains an enormous decrease in
the # of symbols exported by the lib,
- #### but size goes down only from ~ 2.8M to 2.3M
- nm -mfgu liblapack.dylib libcblas.dylib libf77blas.dylib|fgrep ' (from
libatlas'|sed -e 's, (from .*,,' -e 's,.* ,,'|sort -u > lst
- install_name_tool -id %p/lib/libatlas_full.dylib libatlas.dylib
- mv libatlas.dylib libatlas_full.dylib
- cc $flags %p/lib/libatlas.dylib -o libatlas.dylib libatlas.a
-exported_symbols_list lst
- cd ..
+ cd ../bld
make install DESTDIR=%i
cp -pPR lib/*.{a,dylib} %i/lib
rm %i/lib/libtstatlas.a
@@ -157,14 +141,19 @@
chmod -R a-x %i/lib
chmod -R a+rX %i/share
<<
-Shlibs: <<
-!%p/lib/liblapack.dylib
-!%p/lib/libcblas.dylib
-!%p/lib/libf77blas.dylib
-!%p/lib/libatlas.dylib
-!%p/lib/libatlas_full.dylib
+Splitoff: <<
+ Package: %N-shlibs
+ Depends: gcc42-shlibs
+ Files: lib/*.dylib
+ InstallScript: mkdir -p %i/share/doc; ln -s %N %i/share/doc/%n
+ Shlibs: <<
+ %p/lib/liblapack.dylib 0.0.0 %n (>= 3.8.0-6)
+ %p/lib/libcblas.dylib 0.0.0 %n (>= 3.8.0-6)
+ %p/lib/libf77blas.dylib 0.0.0 %n (>= 3.8.0-6)
+ %p/lib/libatlas.dylib 0.0.0 %n (>= 3.8.0-6)
+ <<
<<
-SplitOff: <<
+SplitOff2: <<
Package: %N-doc
Files: share/man share/doc/%N/LAPACK
InstallScript: mkdir -p %i/share/doc; ln -s %N %i/share/doc/%n
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
