[ncl] Drop BuildDODS from Site.local

Orion Poplawski orion at fedoraproject.org
Tue Jul 17 16:05:33 UTC 2012


commit 3416f6d15b34908bc051cb8667aebe8560634549
Author: Orion Poplawski <orion at nwra.com>
Date:   Tue Jul 17 10:05:30 2012 -0600

    Drop BuildDODS from Site.local

 Site.local.ncl |    1 -
 ncl-libs.patch |   12 ------------
 2 files changed, 0 insertions(+), 13 deletions(-)
---
diff --git a/Site.local.ncl b/Site.local.ncl
index b89bef6..695dfa2 100644
--- a/Site.local.ncl
+++ b/Site.local.ncl
@@ -16,7 +16,6 @@
 #define BuildHDFEOS 0
 #define BuildHDFEOS5 0
 #define BuildTRIANGLE 0
-#define BuildDODS 1
 #define HDFlib -lmfhdf -ldf -ljpeg -lz
 #define HDF5lib -lhdf5_hl -lhdf5
 #define BuildUdunits 1
diff --git a/ncl-libs.patch b/ncl-libs.patch
index 4d2cbd7..10b3da0 100644
--- a/ncl-libs.patch
+++ b/ncl-libs.patch
@@ -10,15 +10,3 @@ diff -up ncl_ncarg-6.0.0/ncarview/src/bin/ictrans/yMakefile.libs ncl_ncarg-6.0.0
  #endif
  
  EXTRA_LIBS	= $(X11LIBS) $(SUNLIBS) $(NETCDFLIB) $(HDFLIB) $(CTOFLIBS)
-diff -up ncl_ncarg-6.0.0/ni/src/ncl/yMakefile.libs ncl_ncarg-6.0.0/ni/src/ncl/yMakefile
---- ncl_ncarg-6.0.0/ni/src/ncl/yMakefile.libs	2011-05-27 12:53:25.000000000 -0600
-+++ ncl_ncarg-6.0.0/ni/src/ncl/yMakefile	2012-07-16 15:55:03.393194314 -0600
-@@ -141,7 +141,7 @@ DODS_LIBS	= -lnc-dap -ldap -ldapclient -
- #elif defined(Darwin)
- DODS_LIBS	= -lnc-dap -ldap -ldapclient -lcurl -lxml2 -lpthread -lssl
- #elif defined(linux)
--DODS_LIBS	= -lnc-dap -ldap -ldapclient -lcurl -lrx -lxml2 -lpthread -lidn -ldl
-+DODS_LIBS	= -lcurl -lpthread
- #else
- DODS_LIBS	= -lnc-dap -ldap -ldapclient -lcurl -lrx -lxml2 -lpthread -lssl
- #endif


More information about the scm-commits mailing list