Merge pull request #11 from CDAT/V3.1.2

V3.1.2
CDAT · Feb 9, 2019 · 0c04b0c · 0c04b0c
2 parents 01169f2 + 17e1290
commit 0c04b0c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/ci-support/conda_upload.sh b/ci-support/conda_upload.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 PKG_NAME=libdrs
 USER=cdat
-export VERSION="3.1.1"
+export VERSION="3.1.2"
 echo "Trying to upload to conda"
 echo ""
 echo "Activating base env"

diff --git a/lib/libdrs_Makefile.Mac.fwrap.gfortran.in b/lib/libdrs_Makefile.Mac.fwrap.gfortran.in
@@ -11,8 +11,8 @@
 
 # DEBUG = -O
 DEBUG = -g -O -save-temps
-FC = gfortran
-CC = gcc
+#FC = gfortran
+#CC = gcc
 #ARCHOPT = -arch x86_64
 #ARCHOPT = -arch i386
 ARCHOPT = -m64
@@ -44,16 +44,17 @@ SOURCES = $(FSOURCES) $(CSOURCES)
 INCLUDES = $(FINCLUDES) $(CINCLUDES)
 #--------------------------------------------------------------------
 
-all: drsdef.h libdrsfortran.a libdrsfortran.so
+all: drsdef.h libdrsfortran.a libdrsfortran.dylib
 
-shared: drsdef.h libdrsfortran.so
+shared: drsdef.h libdrsfortran.dylib
 
 libdrsfortran.a: $(OBJECTS)
 	ar rv libdrsfortran.a $?
 
 # formerly in libdrs.so, needed for Fortran->cdms link: -lcdms
-libdrsfortran.so: $(OBJECTS)
-	$(CC) $(ARCHOPT) -headerpad_max_install_names -L@cdat_EXTERNALS@/lib -lgfortran -lnetcdf -lgrib2c -lquadmath -lcdms -shared -lpng -ljasper -o libdrsfortran.so $(OBJECTS)
+libdrsfortran.dylib: libdrsfortran.a
+	$(CC) -shared -Wl,-force_load ./libdrsfortran.a -L@cdat_EXTERNALS@/lib -lcdms -lpng -ljasper -lnetcdf -lgrib2c  -lquadmath -lgfortran -shared -o @cdat_EXTERNALS@/lib/libdrsfortran.dylib
+	# $(CC) -shared -o $(LIBDIR)/libdrs.dylib -Wl,-force_load libdrs.a @NCOPTS@ @HDFOPTS@ @DRSOPTS@  @GRIB2LIB@ @LIBS@
 
 drsdef.h: drsdef.HH
 	$(CPP) -P $(CPPFLAGS) drsdef.HH drsdef.h

diff --git a/lib/libdrs_Makefile.Mac.gfortran.in b/lib/libdrs_Makefile.Mac.gfortran.in
@@ -50,14 +50,16 @@ INCLUDES = $(FINCLUDES) $(CINCLUDES)
 
 all: drsdef.h libdrs.a libdrs.dylib
 
-shared: drsdef.h libdrs.so
+shared: drsdef.h libdrs.dylib
 
 libdrs.a: $(OBJECTS)
 	ar rv libdrs.a $?
 
 # formerly in libdrs.so, needed for Fortran->cdms link: -lcdms
 libdrs.dylib: $(OBJECTS)
-	$(CC) $(ARCHOPT) -headerpad_max_install_names -lgfortran -L@cdat_EXTERNALS@/lib -lnetcdf -lgrib2c  -lquadmath -shared -o libdrs.dylib $(OBJECTS)
+	$(CC) -shared -Wl,-force_load ./libdrs.a -L@cdat_EXTERNALS@/lib -lnetcdf -lgrib2c  -lquadmath -lgfortran -shared -o @cdat_EXTERNALS@/lib/libdrs.dylib
+#   $(CC) $(ARCHOPT) -headerpad_max_install_names -L@cdat_EXTERNALS@/lib -lgfortran -lnetcdf -lgrib2c -lquadmath -lcdms -shared -lpng -ljasper -o @cdat_EXTERNALS@/lib/libdrsfortran.dylib $(OBJECTS)
+#	$(CC) $(ARCHOPT) -headerpad_max_install_names -lgfortran -L@cdat_EXTERNALS@/lib -lnetcdf -lgrib2c  -lquadmath -shared -o libdrs.dylib $(OBJECTS)
 
 drsdef.h: drsdef.HH
 	$(CPP) -P $(CPPFLAGS) drsdef.HH drsdef.h
@@ -66,7 +68,7 @@ drsdef.h: drsdef.HH
 install: libdrs.a shared
 	mkdir -p $(INSTALL_LIB)
 	mkdir -p $(INSTALL_INC)
-	cp libdrs.so $(INSTALL_LIB); chmod 644 $(INSTALL_LIB)/libdrs.so
+	cp libdrs.dylib $(INSTALL_LIB); chmod 644 $(INSTALL_LIB)/libdrs.dylib
 	cp libdrs.a $(INSTALL_LIB); chmod 644 $(INSTALL_LIB)/libdrs.a
 	cp drsdef.h $(INSTALL_INC); chmod 644 $(INSTALL_INC)/drsdef.h
 	cp drscdf.h $(INSTALL_INC); chmod 644 $(INSTALL_INC)/drscdf.h