From: Alexander H. <ale...@us...> - 2011-08-10 19:12:15
|
Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci In directory vz-cvs-3.sog:/tmp/cvs-serv30615 Modified Files: fftw.info Log Message: Didn't _quite_ work on 10.7 as-was. Change all '4.4' to '4.6' gcc46 doesn't like 'FFLAGS = -03', so make that '-O3' Bump revision, since we're changing deps (actually, since it doesn't link to gcc4 Index: fftw.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/fftw.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- fftw.info 2 Aug 2011 03:26:41 -0000 1.1 +++ fftw.info 10 Aug 2011 19:12:11 -0000 1.2 @@ -2,7 +2,7 @@ Package: fftw%type_pkg[-mpi] Type: -mpi (boolean) Version: 2.1.5 -Revision: 1015 +Revision: 1115 Maintainer: None <fin...@li...> Source: ftp://ftp.fftw.org/pub/%n/old/fftw-%v.tar.gz Source-MD5: 8d16a84f3ca02a785ef9eb36249ba433 @@ -19,36 +19,36 @@ NoSetMAKEFLAGS: true SetMAKEFLAGS: -j1 SetCFLAGS: -O3 -fomit-frame-pointer -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -pedantic -fno-schedule-insns -fschedule-insns2 -fstrict-aliasing -ConfigureParams: --enable-shared --enable-type-prefix --enable-threads --enable-fortran --infodir=%p/share/info FFLAGS=-03 +ConfigureParams: --enable-shared --enable-type-prefix --enable-threads --enable-fortran --infodir=%p/share/info FFLAGS=-O3 CompileScript: echo "No Compile Script" InstallScript: << #!/bin/bash -ev if [ "%type_raw[-mpi]" == "-mpi" ]; then if [ %m != "powerpc" ]; then - F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.4/lib -lgfortran" ./configure %c --without-gcc-arch --enable-mpi + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c --without-gcc-arch --enable-mpi else - F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.4/lib -lgfortran" ./configure %c --enable-mpi + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c --enable-mpi fi else if [ %m != "powerpc" ]; then - F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.4/lib -lgfortran" ./configure %c --without-gcc-arch + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c --without-gcc-arch else - F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.4/lib -lgfortran" ./configure %c + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c fi fi make install DESTDIR=%d make clean if [ "%type_raw[-mpi]" == "-mpi" ]; then if [ %m != "powerpc" ]; then - F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.4/lib -lgfortran" ./configure %c --without-gcc-arch --enable-mpi --enable-float + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c --without-gcc-arch --enable-mpi --enable-float else - F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.4/lib -lgfortran" ./configure %c --enable-float --enable-altivec --enable-mpi + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c --enable-float --enable-altivec --enable-mpi fi else if [ %m != "powerpc" ]; then - F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.4/lib -lgfortran" ./configure %c --without-gcc-arch --enable-float + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c --without-gcc-arch --enable-float else - F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.4/lib -lgfortran" ./configure %c --enable-float --enable-altivec + F77=%p/bin/gfortran FLIBS="-L%p/lib/gcc4.6/lib -lgfortran" ./configure %c --enable-float --enable-altivec fi fi make |