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

[gadavis at users.sourceforge.net]

Revision: 16092
          http://gar.svn.sourceforge.net/gar/?rev=16092&view=rev
Author:   gadavis
Date:     2011-11-06 04:31:40 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Clean up some extra options from GCC4

No longer needed after GCC4 upgrade

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

Modified: csw/mgar/pkg/netcdf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/netcdf/trunk/Makefile	2011-11-06 00:57:15 UTC (rev 16091)
+++ csw/mgar/pkg/netcdf/trunk/Makefile	2011-11-06 04:31:40 UTC (rev 16092)
@@ -15,10 +15,10 @@
 UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
 LICENSE = COPYRIGHT
 
-BUILD_DEP_PKGS += CSWhdf5rt CSWzlib
-BUILD_DEP_PKGS += CSWgcc4gfortranrt CSWgcc4corert CSWgcc4g++rt
+BUILD_DEP_PKGS += CSWhdf5rt CSWlibhdf5-dev CSWzlib
+#BUILD_DEP_PKGS += CSWgcc4gfortranrt CSWgcc4corert CSWgcc4g++rt
 BUILD_DEP_PKGS += CSWtetex 
-BUILD_DEP_PKGS += CSWgcc4gfortran
+#BUILD_DEP_PKGS += CSWgcc4gfortran
 
 PACKAGES = CSWnetcdf
 CATALOGNAME_CSWnetcdf = netcdf
@@ -105,7 +105,7 @@
 GARCOMPILER = GCC4
 ## Attempt to fix problem with configure not finding libgfortran.so.3 when 
 ## compiling with GCC4
-CONFIGURE_ENV += LD_LIBRARY_PATH=/opt/csw/gcc4/lib/$(MM_LIBDIR)
+#CONFIGURE_ENV += LD_LIBRARY_PATH=/opt/csw/gcc4/lib/$(MM_LIBDIR)
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += F77=$(F77) FC=$(FC) CC=$(CC) CXX=$(CXX)
@@ -141,16 +141,16 @@
 ##
 ## Adding -dalign to *FLAGS in attempt to fix bus error in nf_test/ftst_vars4
 ## in fuction nf_put_vlen_element
-EXTRA_CFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
-EXTRA_FFLAGS= -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
-EXTRA_FCFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
-EXTRA_CXXFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+#EXTRA_CFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+#EXTRA_FFLAGS= -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+#EXTRA_FCFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
+#EXTRA_CXXFLAGS = -L/opt/csw/gcc4/lib/$(MM_LIBDIR) -dalign
 
 ## During the 32-bit sparc build, the C++ bindings were barfing with an error 
 ## about undefined symbol __sync_fetch_and_add_4 in libnetcdf_c++
 ## From Porting FAQ: http://wiki.opencsw.org/porting-faq#toc5
 ## OPT_FLAGS_GCC = -O2 -pipe
-OPT_FLAGS_GCC = 
+#OPT_FLAGS_GCC = 
 
 ## Git patching is failing on a remerge/repackage
 NOGITPATCH = 1

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