Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory 
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20067/10.7/stable/main/finkinfo/sci

Modified Files:
        netcdf-fortran5.info 
Log Message:
Simplify the build by using _real_ "gfortran" from gcc4N-compiler.


Index: netcdf-fortran5.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/netcdf-fortran5.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- netcdf-fortran5.info        23 May 2013 15:09:22 -0000      1.11
+++ netcdf-fortran5.info        12 Jun 2013 20:08:12 -0000      1.12
@@ -39,13 +39,12 @@
 
 ConfigureParams: <<
   --enable-shared --disable-static \
-  FFLAGS=-O2 FCFLAGS=-O2 FC=%b/gfortran F77=%b/gfortran F90=%b/gfortran \
+  FFLAGS=-O2 FCFLAGS=-O2 FC=%p/lib/gcc%type_raw[gcc]/bin/gfortran 
F77=%p/lib/gcc%type_raw[gcc]/bin/gfortran 
F90=%p/lib/gcc%type_raw[gcc]/bin/gfortran \
   --mandir='${prefix}/share/man' \
   --infodir='${prefix}/share/info' \
   --docdir='${prefix}/share/doc/netcdf' 
 <<
 CompileScript: <<
-       ln -fs %p/bin/gfortran-fsf-%type_raw[gcc] %b/gfortran
        %{default_script}
        fink-package-precedence .
 <<
@@ -58,7 +57,7 @@
   #!/bin/sh -ev
   make install DESTDIR=%d
   # undo the "hack"
-  perl -pi -e 's,fc=.*,fc=\"%p/bin/gfortran",' %i/bin/nf-config
+  perl -pi -e 's,fc=.*,fc=\"%p/lib/gcc%type_raw[gcc]/bin/gfortran",' 
%i/bin/nf-config
   mkdir -p %i/share/doc
   mkdir -p %i/share/info
   # Add examples for F77 and F90
@@ -103,8 +102,8 @@
 Bump revision and versioned dependencies on hdf5.7 and netcdf-c7 when HDF5 
(hdf5.8) 
 version is updated.
 
-Use a hack (courtesy of Remko Scharoo) to allow the use of gcc4N-compiler
-rather than gcc4N and avoid extra double-underscores.  (Thanks, libtool!)
+Specify full path to the "gfortran" executable in gcc4N compiler to avoid 
+extra double-underscores.  (Thanks, libtool!)
 <<
 DescPort: <<
 FFLAGS=-O2 FCFLAGS=-O2 is essential to avoid debugging mode flags (-g).


------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to