mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
60 lines
1.8 KiB
Diff
60 lines
1.8 KiB
Diff
--- config/Project.orig 2019-02-28 08:44:39.000000000 +0900
|
|
+++ config/Project 2019-08-25 12:36:00.000000000 +0900
|
|
@@ -279,7 +279,7 @@
|
|
|
|
#ifdef BuildHDF5
|
|
#ifndef HDF5lib
|
|
-#define HDF5lib -lhdf5_hl -lhdf5 -lsz -lz
|
|
+#define HDF5lib -lhdf5_hl -lhdf5
|
|
#endif /* HDF5lib */
|
|
#else
|
|
#define HDF5lib
|
|
@@ -314,7 +314,7 @@
|
|
#endif /* NetCDFlib */
|
|
|
|
#ifndef NetCDF4lib
|
|
-#define NetCDF4lib -lhdf5_hl -lhdf5 -lsz
|
|
+#define NetCDF4lib -lhdf5_hl -lhdf5
|
|
#endif /* NetCDF4lib */
|
|
|
|
#ifndef UdUnitslib
|
|
@@ -531,8 +531,6 @@
|
|
ICTRANSLIBSRC = $(NVIEWLIBSRC)/libictrans
|
|
NCARGRASLIBSRC = $(NVIEWLIBSRC)/libncarg_ras
|
|
HLULIBSRC = $(NILIBSRC)/hlu
|
|
-BLASSRC = $(EXTERNALSRC)/blas
|
|
-LAPACKSRC = $(EXTERNALSRC)/lapack
|
|
SPHERESRC = $(EXTERNALSRC)/sphere3.1_dp
|
|
FFTPACK5SRC = $(EXTERNALSRC)/fftpack5_dp
|
|
NGOLIBSRC = $(NILIBSRC)/ngo
|
|
@@ -558,10 +556,10 @@
|
|
NIOLIB = -lnio
|
|
NCLLIB =
|
|
NCLAPILIB = -lNGncl
|
|
-BLASLIB = -lblas_ncl
|
|
-LAPACKLIB = -llapack_ncl
|
|
-SPHERELIB = -lsphere3.1_dp
|
|
-FFTPACK5LIB = -lfftpack5_dp
|
|
+BLASLIB = -lvecLibFort
|
|
+LAPACKLIB = -lvecLibFort
|
|
+SPHERELIB = $(SPHERESRC)/libsphere3.1_dp.a
|
|
+FFTPACK5LIB = $(FFTPACK5SRC)/libfftpack5_dp.a
|
|
|
|
CTRANSLIB = -lNGctrans
|
|
ICTRANS_LIB = -lNGictrans
|
|
@@ -603,10 +601,10 @@
|
|
XCBLIB = _UseLib(-L$(XCBLIBSRC),-lXcb)
|
|
NCLLIB = _UseLib(-L$(NCLLIBSRC),-lncl)
|
|
NCLAPILIB = _UseLib(-L$(NCLLIBSRC),-lnclapi)
|
|
-BLASLIB = _UseLib(-L$(BLASSRC),-lblas_ncl)
|
|
-LAPACKLIB = _UseLib(-L$(LAPACKSRC),-llapack_ncl)
|
|
-SPHERELIB = _UseLib(-L$(SPHERESRC),-lsphere3.1_dp)
|
|
-FFTPACK5LIB = _UseLib(-L$(FFTPACK5SRC),-lfftpack5_dp)
|
|
+BLASLIB = -lvecLibFort
|
|
+LAPACKLIB = -lvecLibFort
|
|
+SPHERELIB = $(SPHERESRC)/libsphere3.1_dp.a
|
|
+FFTPACK5LIB = $(FFTPACK5SRC)/libfftpack5_dp.a
|
|
|
|
CTRANSLIB = _DepLib($(CTRANSLIBSRC),$(ROBJROOT),libctrans.o)
|
|
ICTRANS_LIB = _DepLib($(ICTRANSLIBSRC),$(ROBJROOT),libictrans_.o)
|