24 lines
2.8 KiB
Diff
24 lines
2.8 KiB
Diff
diff -up ncl-6.6.2/ni/src/ncl/yMakefile.gdal ncl-6.6.2/ni/src/ncl/yMakefile
|
|
--- ncl-6.6.2/ni/src/ncl/yMakefile.gdal 2019-02-27 16:44:39.000000000 -0700
|
|
+++ ncl-6.6.2/ni/src/ncl/yMakefile 2020-07-17 21:53:50.743277471 -0600
|
|
@@ -198,14 +198,14 @@ EXTRA_CLDFLAGS = $(DEV_LIB_SEARCH) $(EXT
|
|
#endif
|
|
|
|
#if defined(SUN)
|
|
-# EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GDALLIB) $(GRIDSPECLIB) $(UDUNITSLIB) $(V5DLIB) $(GRIB2LIB) $(PNGLIB) $(CAIROLIB) $(SPHERELIB) $(FFTPACK5LIB) -fast -xlic_lib=sunperf -lnsl -lintl -lsocket -ldl -lw -lfui
|
|
-EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIB) $(UDUNITSLIB) $(V5DLIB) $(GRIB2LIB) $(PNGLIB) $(CAIROLIB) $(EEMDLIB) $(EXTERNALLIBS) -lnsl -lintl -lsocket -ldl -lw
|
|
+# EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GRIB2LIB) $(GDALLIB) $(GRIDSPECLIB) $(UDUNITSLIB) $(V5DLIB) $(PNGLIB) $(CAIROLIB) $(SPHERELIB) $(FFTPACK5LIB) -fast -xlic_lib=sunperf -lnsl -lintl -lsocket -ldl -lw -lfui
|
|
+EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GRIB2LIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIB) $(UDUNITSLIB) $(V5DLIB) $(PNGLIB) $(CAIROLIB) $(EEMDLIB) $(EXTERNALLIBS) -lnsl -lintl -lsocket -ldl -lw
|
|
#elif defined(AIX)
|
|
-EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIB) $(UDUNITSLIB) $(V5DLIB) $(GRIB2LIB) $(PNGLIB) $(CAIROLIB) $(EEMDLIB) $(EXTERNALLIBS) -lxlf90 -lxlopt
|
|
+EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GRIB2LIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIB) $(UDUNITSLIB) $(V5DLIB) $(PNGLIB) $(CAIROLIB) $(EEMDLIB) $(EXTERNALLIBS) -lxlf90 -lxlopt
|
|
#elif (defined(IRIX) || defined(IRIX64))
|
|
-EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIB) $(UDUNITSLIB) $(V5DLIB) $(GRIB2LIB) $(PNGLIB) $(CAIROLIB) $(EEMDLIB) $(EXTERNALLIBS)
|
|
+EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GRIB2LIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIB) $(UDUNITSLIB) $(V5DLIB) $(PNGLIB) $(CAIROLIB) $(EEMDLIB) $(EXTERNALLIBS)
|
|
#else
|
|
-EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIB) $(UDUNITSLIB) $(V5DLIB) $(GRIB2LIB) $(PNGLIB) $(CAIROLIB) $(EEMDLIB) $(EXTERNALLIBS)
|
|
+EXTRA_LIBS = $(NCDFLIBS) $(HDFEOS5LIB) $(NETCDF4LIB) $(HDFEOSLIB) $(HDFLIB) $(HDF5LIB) $(GRIB2LIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIB) $(UDUNITSLIB) $(V5DLIB) $(PNGLIB) $(CAIROLIB) $(EEMDLIB) $(EXTERNALLIBS)
|
|
#endif
|
|
|
|
SYS_LIBS = $(XLIB) $(CTOFLIBS) -lm $(ARCH_LIBS) $(DYNAMIC_LIBS)
|