ncl/ncl-libs.patch
Orion Poplawski df059ea6c1 Don't link against librx, was causing memory corruption
Compile with -fno-strict-aliasing for now
2012-07-16 16:15:48 -06:00

25 lines
1.1 KiB
Diff

diff -up ncl_ncarg-6.0.0/ncarview/src/bin/ictrans/yMakefile.libs ncl_ncarg-6.0.0/ncarview/src/bin/ictrans/yMakefile
--- ncl_ncarg-6.0.0/ncarview/src/bin/ictrans/yMakefile.libs 2011-05-27 12:53:51.000000000 -0600
+++ ncl_ncarg-6.0.0/ncarview/src/bin/ictrans/yMakefile 2012-07-16 15:29:08.141021676 -0600
@@ -29,6 +29,8 @@ DEP_LIBS = $(DEPICTRANSLIB) $(DEPCTRANSL
#ifdef IRIX
MORE_LIBS = -lmalloc
+#else
+MORE_LIBS = -lm
#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