rpms/netcdf/devel netcdf.spec,1.10,1.11

[Ed Hill (edhill)]

Author: edhill

Update of /cvs/extras/rpms/netcdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13510/devel

Modified Files:
	netcdf.spec 
Log Message:
building the library twice (once each for g77 and gfortran)
fixes an annoying problem for people who need both compilers



Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- netcdf.spec	29 Sep 2005 18:15:30 -0000	1.10
+++ netcdf.spec	16 Oct 2005 06:11:56 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           netcdf
 Version:        3.6.0
-Release:        7.p1%{?dist}
+Release:        8.p1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
@@ -66,6 +66,17 @@
 #  The parallel build was tested and it does NOT work.
 #  make %{?_smp_mflags}
 make
+mkdir lib_g77
+cp libsrc/libnetcdf.a lib_g77
+make clean
+CPPFLAGS="-fPIC -DpgiFortran"
+%configure
+make
+#  The below seems to work but I worry that it would lead to odd runtime
+#  errors due to possible symbol collisions in the "cfortran.h" bits.  
+#  The safer thing to do is to simply build and install two libraries,  
+#  one for the older g77 and one for gfortran.
+#    ar cru libsrc/libnetcdf.a lib_g77/libnetcdf.a
 unset FC
 unset CPPFLAGS
 unset FFLAGS
@@ -81,6 +92,7 @@
 %makeinstall INCDIR=${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 \
   LIBDIR=${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 \
   MANDIR=${RPM_BUILD_ROOT}%{_mandir}
+cp lib_g77/libnetcdf.a ${RPM_BUILD_ROOT}%{_libdir}/netcdf-3/libnetcdf_g77.a
 rm -rf ${RPM_BUILD_ROOT}%{_mandir}/man3f*
 find ${RPM_BUILD_ROOT}%{_includedir}/netcdf-3 -type f | xargs chmod 644
 find ${RPM_BUILD_ROOT}%{_libdir}/netcdf-3 -type f | xargs chmod 644
@@ -104,6 +116,10 @@
 
 
 %changelog
+* Sun Oct 16 2005 Ed Hill <ed at eh3.com> - 3.6.0-8.p1
+- building the library twice (once each for g77 and gfortran) 
+  fixes an annoying problem for people who need both compilers
+
 * Fri Sep 29 2005 Ed Hill <ed at eh3.com> - 3.6.0-7.p1
 - add FFLAGS="-fPIC"