Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19846/10.7/stable/main/finkinfo/sci
Modified Files:
netcdf7-gfortran.info
Log Message:
Fix dependencies. Simplify the build by using _real_ "gfortran" from
gcc4N-compiler.
Index: netcdf7-gfortran.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/netcdf7-gfortran.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- netcdf7-gfortran.info 23 May 2013 15:09:22 -0000 1.20
+++ netcdf7-gfortran.info 12 Jun 2013 20:07:45 -0000 1.21
@@ -1,13 +1,14 @@
Info4: <<
Package: netcdf7-gfortran
Version: 4.1.3
-Revision: 16
+Revision: 17
BuildDependsOnly: true
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
+Type: gcc (4.8)
BuildDepends: <<
hdf5.8 (>= 1.8.11-1),
- gcc48,
+ gcc%type_pkg[gcc]-compiler,
fink-package-precedence,
netcdf7 (>= %v-10),
libcurl4,
@@ -38,8 +39,8 @@
<<
ConfigureParams: <<
--libdir=%p/opt/netcdf7/lib --includedir=%p/opt/netcdf7/include \
- --enable-shared CFLAGS=-O2 FFLAGS=-O2 FCFLAGS=-O2 FC=%p/bin/gfortran \
- F77=%p/bin/gfortran F90=%p/bin/gfortran \
+ --enable-shared CFLAGS=-O2 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' --enable-docs-install
--docdir='${prefix}/share/doc/netcdf' \
--enable-dap \
--with-netcdf-c-lib=%p/opt/netcdf7/lib --enable-netcdf-4 \
@@ -68,7 +69,7 @@
rm %i/share/info/netcdf-c* %i/share/info/netcdf-install.info
%i/share/info/netcdf-tutorial.info %i/share/info/netcdf.info
rm %i/share/man/man3/netcdf.3
rm %i/bin/nc-config
- perl -p -e 's|(fc=).*|\1"%p/bin/gfortran"|; \
+ perl -p -e 's|(fc=).*|\1"%p/lib/gcc%type_raw[gcc]/bin/gfortran"|; \
s/(flibs=).*/\1"-L\$\{libdir\} -lnetcdff
-lnetcdf"/; \
s/(has_f\d{2}=).*/\1"yes"/g' \
%p/bin/nc-config-nc7 > %i/bin/nc-config-nc7g
@@ -83,7 +84,7 @@
<<
SplitOff: <<
Package: %N-shlibs
- Depends: netcdf7-shlibs (>= %v-1), gcc47-shlibs, hdf5.8-shlibs (>=
1.8.11-1), szip-shlibs, libcurl4-shlibs
+ Depends: netcdf7-shlibs (>= %v-1), gcc%type_pkg[gcc]-shlibs, hdf5.8-shlibs
(>= 1.8.11-1), szip-shlibs, libcurl4-shlibs
Files: opt/netcdf7/lib/libnetcdff.*.dylib
Shlibs: %p/opt/netcdf7/lib/libnetcdff.5.dylib 7.0.0 %n (>= 4.1.3-1)
DocFiles: COPYRIGHT README RELEASE_NOTES
@@ -112,9 +113,12 @@
DescPackaging: <<
This Fortran interface is created as a different package so that users
do not have to install a Fortran compiler to just get the C/C++ interface.
-BuildDepends: gcc47 rather than gcc47-compiler to avoid the "second underscore"
-issue.
+
+Specify full path to the "gfortran" executable in gcc4N compiler to avoid
+extra double-underscores. (Thanks, libtool!)
+
All docs are moved into the directory /sw/share/doc/netcdf7.
+
Manually move docs from the tarball to avoid potentially triggering a rebuild.
Patch out a stray print statement--thanks to Remko Scharroo for finding this.
------------------------------------------------------------------------------
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
