[csw-devel] SF.net SVN: gar:[16107] csw/mgar/pkg/netcdf/trunk

[gadavis at users.sourceforge.net]

Revision: 16107
          http://gar.svn.sourceforge.net/gar/?rev=16107&view=rev
Author:   gadavis
Date:     2011-11-06 20:37:09 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
/home/gadavis/mgar/pkg/netcdf/trunk: Remove no-longer necessary build options that were breaking the fortran tests

Modified Paths:
--------------
    csw/mgar/pkg/netcdf/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/netcdf/trunk/files/CSWlibnetcdf-c++5.cswreleasemgr
    csw/mgar/pkg/netcdf/trunk/files/CSWlibnetcdf6.cswreleasemgr
    csw/mgar/pkg/netcdf/trunk/files/CSWlibnetcdff5.cswreleasemgr

Modified: csw/mgar/pkg/netcdf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/trunk/Makefile	2011-11-06 20:34:33 UTC (rev 16106)
+++ csw/mgar/pkg/netcdf/trunk/Makefile	2011-11-06 20:37:09 UTC (rev 16107)
@@ -9,9 +9,6 @@
 SPKG_SOURCEURL = http://www.unidata.ucar.edu/software/netcdf/
 MASTER_SITES = ftp://ftp.unidata.ucar.edu/pub/netcdf/
 DISTFILES  += $(NAME)-$(VERSION).tar.gz
-DISTFILES  += CSWlibnetcdf6.cswreleasemgr
-DISTFILES  += CSWlibnetcdff5.cswreleasemgr
-DISTFILES  += CSWlibnetcdf-c++5.cswreleasemgr
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 LICENSE = COPYRIGHT
 
@@ -92,25 +89,11 @@
 RUNTIME_DEP_PKGS_CSWnetcdf-devel += CSWlibnetcdff5
 RUNTIME_DEP_PKGS_CSWnetcdf-devel += CSWlibnetcdf-c++5
 
-## CFLAGS AND LDFLAGS are necessary due to problems with the fortran bindings when
-## building 64-bit
-BUILD_ARGS  = CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" 
-BUILD_ARGS += FFLAGS="$(FFLAGS)" FCFLAGS="$(FCFLAGS)"
-## CXXFLAGS are necessary due to the gcc3core_rt problem noted below
-BUILD_ARGS += CXXFLAGS="$(CXXFLAGS)"
-
-## Test args need to be the same otherwise various tests don't link
-#TEST_ARGS = $(BUILD_ARGS)
-
 GARCOMPILER = GCC4
 
 CONFIGURE_ARGS  = $(DIRPATHS)
-CONFIGURE_ARGS += F77=$(F77) FC=$(FC) CC=$(CC) CXX=$(CXX)
-CONFIGURE_ARGS += CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" FFLAGS="$(FFLAGS)" FCFLAGS="$(FCFLAGS)"
 CONFIGURE_ARGS += --enable-netcdf-4
-## DAP is disabled due to bugs on Sparc Solaris 9 GCC4. Bug filed with UCAR:
-## netCDF #ARO-502165
-#CONFIGURE_ARGS += --enable-dap
+CONFIGURE_ARGS += --enable-dap
 CONFIGURE_ARGS += --disable-dap
 CONFIGURE_ARGS += --enable-ncgen4
 CONFIGURE_ARGS += --enable-shared

Deleted: csw/mgar/pkg/netcdf/trunk/files/CSWlibnetcdf-c++5.cswreleasemgr
===================================================================
--- csw/mgar/pkg/netcdf/trunk/files/CSWlibnetcdf-c++5.cswreleasemgr	2011-11-06 20:34:33 UTC (rev 16106)
+++ csw/mgar/pkg/netcdf/trunk/files/CSWlibnetcdf-c++5.cswreleasemgr	2011-11-06 20:37:09 UTC (rev 16107)
@@ -1,2 +0,0 @@
-This package depends on CSWgcc4core due to Mantis Bug ID 4497
-The various libraries are not found by the 64 bit executable due to the 32 and 64 symlinks not being present in /opt/csw/gcc4/lib

Deleted: csw/mgar/pkg/netcdf/trunk/files/CSWlibnetcdf6.cswreleasemgr
===================================================================
--- csw/mgar/pkg/netcdf/trunk/files/CSWlibnetcdf6.cswreleasemgr	2011-11-06 20:34:33 UTC (rev 16106)
+++ csw/mgar/pkg/netcdf/trunk/files/CSWlibnetcdf6.cswreleasemgr	2011-11-06 20:37:09 UTC (rev 16107)
@@ -1,2 +0,0 @@
-This package depends on CSWgcc4core due to Mantis Bug ID 4497
-The various libraries are not found by the 64 bit executable due to the 32 and 64 symlinks not being present in /opt/csw/gcc4/lib

Deleted: csw/mgar/pkg/netcdf/trunk/files/CSWlibnetcdff5.cswreleasemgr
===================================================================
--- csw/mgar/pkg/netcdf/trunk/files/CSWlibnetcdff5.cswreleasemgr	2011-11-06 20:34:33 UTC (rev 16106)
+++ csw/mgar/pkg/netcdf/trunk/files/CSWlibnetcdff5.cswreleasemgr	2011-11-06 20:37:09 UTC (rev 16107)
@@ -1,2 +0,0 @@
-This package depends on CSWgcc4core due to Mantis Bug ID 4497
-The various libraries are not found by the 64 bit executable due to the 32 and 64 symlinks not being present in /opt/csw/gcc4/lib

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.