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

Modified Files:
        netcdf-fortran5.info 
Log Message:
Switch to gcc48-compiler.  Tweak from Remko S to avoid extra
double-underscores.


Index: netcdf-fortran5.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/netcdf-fortran5.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- netcdf-fortran5.info        23 Jan 2013 21:51:30 -0000      1.9
+++ netcdf-fortran5.info        11 Apr 2013 14:09:58 -0000      1.10
@@ -1,11 +1,23 @@
+Info2: <<
 Package: netcdf-fortran5
 Version: 4.2
-Revision: 6
+Revision: 7
 BuildDependsOnly: true
 Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
 
+Type: gcc (4.8)
+
 Depends: %n-shlibs (= %v-%r)
-BuildDepends: doxygen, hdf5.7 (>= 1.8.10), gcc47, fink-package-precedence, 
netcdf-c7 (>= 4.2.1.1-2), netcdf-bin (>= 4.2.1.1-2), libcurl4, szip
+BuildDepends: <<
+       netcdf-c7 (>= 4.2.1.1-2), 
+       netcdf-bin (>= 4.2.1.1-2),
+       gcc%type_pkg[gcc],  
+       hdf5.7 (>= 1.8.10-patch1), 
+       libcurl4, 
+       szip,
+       doxygen, 
+       fink-package-precedence
+<<
 Conflicts: netcdf (<= 3.6.1-1003), netcdf-absoft, netcdf-g95, netcdf-gfortran, 
netcdf7-gfortran
 Replaces: netcdf (<= 3.6.1-1003), netcdf-absoft, netcdf-g95, netcdf-gfortran, 
netcdf7-gfortran
 
@@ -16,13 +28,13 @@
 
 ConfigureParams: <<
   --enable-shared --disable-static \
-  FFLAGS=-O2 FCFLAGS=-O2 FC=%p/bin/gfortran \
-  F77=%p/bin/gfortran F90=%p/bin/gfortran \
+  FFLAGS=-O2 FCFLAGS=-O2 FC=%b/gfortran F77=%b/gfortran F90=%b/gfortran \
   --mandir='${prefix}/share/man' \
   --infodir='${prefix}/share/info' \
   --docdir='${prefix}/share/doc/netcdf' 
 <<
 CompileScript: <<
+       ln -fs %p/bin/gfortran-fsf-4.8 %b/gfortran
        %{default_script}
        fink-package-precedence .
 <<
@@ -34,6 +46,8 @@
 InstallScript: <<
   #!/bin/sh -ev
   make install DESTDIR=%d
+  # undo the "hack"
+  perl -pi -e 's,fc=.*,fc=\"%p/bin/gfortran",' %i/bin/nf-config
   mkdir -p %i/share/doc
   mkdir -p %i/share/info
   # Add examples for F77 and F90
@@ -47,7 +61,7 @@
 <<
 SplitOff: <<
   Package: %N-shlibs
-  Depends: netcdf-c7-shlibs (>= 4.2.1-1), gcc47-shlibs
+  Depends: netcdf-c7-shlibs (>= 4.2.1-1), gcc%type_pkg[gcc]-shlibs
   Files: lib/libnetcdff.*.dylib
   Shlibs: %p/lib/libnetcdff.5.dylib 9.0.0 %n (>= 4.2-1)
   DocFiles: COPYRIGHT README 
@@ -67,16 +81,22 @@
 chosen.
 <<
 DescUsage: <<
-When building by hand, make sure netcdf-c7 is installed.
+When building by hand against this package, make sure netcdf-c7 and gcc48 are
+installed, since, by policy, this package cannot declare runtime dependencies
+on them.
 <<
 DescPackaging: <<
 Manually move docs from the tarball to avoid potentially triggering a rebuild.
 
 Bump revision and versioned dependencies on hdf5.7 and netcdf-c7 when HDF5 
(hdf5.7) 
 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!)
 <<
 DescPort: <<
 FFLAGS=-O2 FCFLAGS=-O2 is essential to avoid debugging mode flags (-g).
 <<
 Homepage: http://www.unidata.ucar.edu/software/netcdf/
 License: OSI-Approved
+<<


------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to