Update of /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv18222

Modified Files:
        atlas.info 
Log Message:
Update + simplify: substantial part of patchscript included upstream.

Index: atlas.info
===================================================================
RCS file: /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/atlas.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- atlas.info  24 Dec 2007 16:02:04 -0000      1.11
+++ atlas.info  11 Jun 2008 15:16:30 -0000      1.12
@@ -1,6 +1,6 @@
 Package: atlas
-Version: 3.8.0
-Revision: 6
+Version: 3.8.2
+Revision: 1
 Description: Portably optimal linear algebra software
 DescDetail: <<
 The current version provides a complete BLAS and LAPACK API.
@@ -24,39 +24,32 @@
 DescPort: <<
 The optimized subset of LAPACK provided by ATLAS is merged
 with the full LAPACK from http://www.netlib.org/lapack.
+
+Still doesn't build on (some ?) G4's.
 <<
 DescUsage: <<
 Order is important when linking! Use:
 -L%p/lib -llapack -lcblas -lf77blas -latlas
 <<
 Source: mirror:sourceforge:math-atlas/%n%v.tar.bz2
-Source-MD5: fd42a00f36243bf4815d035b226ec305
+Source-MD5: dd888f5d066c1fafeaaf2ae6b37e0b85
 Source2: http://www.netlib.org/lapack/lapack-3.1.1.tgz
 Source2-MD5: 00b21551a899bcfbaa7b8443e1faeef9
 SourceDirectory: ATLAS
 License: BSD
 # since we're experimenting with building a dylib :
 BuildDependsOnly: true
-BuildDepends: gcc42
+BuildDepends: gcc43
 PatchScript: <<
 #!/bin/sh -ev
-## 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` ..
-## or else at least to solve the remaining unknown cases with that ...
-sed -i.bak -e '/PPCG4/,/PPCG5/c\
-            if (strstr(res, "7") || strstr(res, "8") || strstr(res, "9") || 
strstr(res, "11") || strstr(res, "12")) mach = PPCG5;\
-            else if (strstr(res, "1,2") || strstr(res, "c3") || strstr(res, 
"c5")) mach = PPCG4;\
-         }\
-         else if (strstr(res, "PowerBook"))\
-         {\
-            if (strstr(res, "5") || strstr(res, "6") || strstr(res, "3,2") || 
strstr(res, "3,3") || strstr(res, "3,4")) mach = PPCG4;\
-         }\
-         else if (strstr(res, "RackMac"))\
-         {\
-            if (strstr(res, "3")) mach = PPCG5;\
-            else mach = PPCG4;' \
-       CONFIG/src/backend/archinfo_freebsd.c
+#### tentative fix for G4 problems
+cd CONFIG/ARCHS
+tar -zxf PPCG432AltiVec.tgz
+rm PPCG432AltiVec/gemm/gcc/{c{u,}Clean,suClean{M,N}}*
+tar -czf PPCG432AltiVec.tgz PPCG432AltiVec
+rm -fR PPCG432AltiVec
+cd -
+####
 cd ..; ln -s lapack-3.1.1 LAPACK
 cd LAPACK
 sed -e 's,\.\./\.\./blas\$(PLAT)\.a,%b/../bld/lib/libptf77blas.a 
%b/../bld/lib/libptcblas.a %b/../bld/lib/libatlas.a,' \
@@ -79,8 +72,6 @@
  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"
- # 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;
@@ -97,11 +88,11 @@
  # 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 -ldylib1.o -dylib_install_name"
- $ld %p/lib/libatlas.dylib libatlas.a -o libatlas.dylib -lSystemStubs -lSystem
- $ld %p/lib/libcblas.dylib libcblas.a -o libcblas.dylib -latlas -lSystemStubs 
-lSystem
- $ld %p/lib/libf77blas.dylib libf77blas.a -o libf77blas.dylib -lgfortran 
-latlas -lSystemStubs -lSystem
- $ld %p/lib/liblapack.dylib liblapack.a -o liblapack.dylib -lf77blas 
-lgfortran -lcblas -latlas -lSystemStubs -lSystem
+ ld="ld -dynamic -dylib -single_module -dead_strip -x -all_load -L. 
-L%p/lib/gcc4.3/lib -ldylib1.o -dylib_install_name"
+ $ld %p/lib/libatlas.dylib libatlas.a -o libatlas.dylib -lSystem
+ $ld %p/lib/libcblas.dylib libcblas.a -o libcblas.dylib -latlas -lSystem
+ $ld %p/lib/libf77blas.dylib libf77blas.a -o libf77blas.dylib -lgfortran 
-latlas -lSystem
+ $ld %p/lib/liblapack.dylib liblapack.a -o liblapack.dylib -lf77blas 
-lgfortran -lcblas -latlas -lgcc_s.1 -lSystem
  ## 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
@@ -115,13 +106,13 @@
 #!/bin/sh -ev
  cd ../LAPACK
  mv lapack_LINUX.a lapack_LINUX.a~; ln -s ../bld/lib/liblapack.a lapack_LINUX.a
- make lapack_testing blas_testing
+ make -k lapack_testing blas_testing || :
  # to get timing uncluttered by compilation times, we'll repeat the tests at 
the end of the log:
  rm {BLAS,TESTING}/*.out
  cd ../bld
- make test pttest time
+ make -k test pttest time
  cd ../LAPACK
- time { make blas_testing; cd TESTING; make ; }
+ time { make -k blas_testing; cd TESTING; make -k ; } || :
 # here: real 3m10.903s; user 2m55.622s; sys 0m15.570s  (average of 3)
 <<
 <<
@@ -143,7 +134,7 @@
 <<
 Splitoff: <<
        Package: %N-shlibs
-       Depends: gcc42-shlibs
+       Depends: gcc43-shlibs
        Files: lib/*.dylib
        InstallScript: mkdir -p %i/share/doc; ln -s %N %i/share/doc/%n
        Shlibs: <<
@@ -159,4 +150,4 @@
        InstallScript: mkdir -p %i/share/doc; ln -s %N %i/share/doc/%n
 <<
 Homepage: http://math-atlas.sourceforge.net
-Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
+Maintainer: None <[EMAIL PROTECTED]>


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to