Try to fix build errors

grimbough · Oct 18, 2023 · 13bb929 · 13bb929
1 parent 61c1a5c
commit 13bb929
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 14 deletions.
diff --git a/configure b/configure
@@ -676,6 +676,8 @@ ac_ct_CC
 LDFLAGS
 AR
 R_CPPFLAGS
+RANLIB
+MAKE
 CPPFLAGS
 CXXPICFLAGS
 CPICFLAGS
@@ -2413,6 +2415,10 @@ CXXPICFLAGS=`"${R_HOME}/bin/R" CMD config CXXPICFLAGS`
 
 CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS`
 
+MAKE=`"${R_HOME}/bin/R" CMD config MAKE`
+
+RANLIB=`"${R_HOME}/bin/R" CMD config RANLIB`
+
 R_CPPFLAGS=`"${R_HOME}/bin/R" CMD config --cppflags`
 
 

diff --git a/configure.ac b/configure.ac
@@ -21,6 +21,8 @@ AC_SUBST(CXXFLAGS, `"${R_HOME}/bin/R" CMD config CXXFLAGS`)
 AC_SUBST(CPICFLAGS, `"${R_HOME}/bin/R" CMD config CPICFLAGS`)
 AC_SUBST(CXXPICFLAGS, `"${R_HOME}/bin/R" CMD config CXXPICFLAGS`)
 AC_SUBST(CPPFLAGS, `"${R_HOME}/bin/R" CMD config CPPFLAGS`)
+AC_SUBST(MAKE, `"${R_HOME}/bin/R" CMD config MAKE`)
+AC_SUBST(RANLIB, `"${R_HOME}/bin/R" CMD config RANLIB`)
 AC_SUBST(R_CPPFLAGS, `"${R_HOME}/bin/R" CMD config --cppflags`)
 
 dnl seems unreliable as to whether this information is available

diff --git a/src/Makevars.in b/src/Makevars.in
@@ -6,6 +6,7 @@ export PKG_CPICFLAGS=@CPICFLAGS@
 export PKG_CXXPICFLAGS=@CXXPICFLAGS@
 export PKG_CPPFLAGS=@CPPFLAGS@
 export PKG_R_CPPFLAGS=@R_CPPFLAGS@
+export RANLIB=@RANLIB@
 
 ZSTD_LIB=@ZSTD_LIB@
 BLOSC_LIB=@BLOSC_LIB@

diff --git a/src/Makevars.win.in b/src/Makevars.win.in
@@ -4,24 +4,22 @@ export CC=@CC@
 export PKG_CFLAGS=@CFLAGS@
 export PKG_CPICFLAGS=@CPICFLAGS@
 export CXX=@CXX@
-#export PKG_CXXFLAGS=`R CMD config CXXFLAGS`
-#export PKG_CXXPICFLAGS=`R CMD config CXXPICFLAGS`
 export PKG_CPPFLAGS=@CPPFLAGS@
 export PKG_R_CPPFLAGS=@R_CPPFLAGS@
-#export AR=`R CMD config AR`
-#export RANLIB=`R CMD config RANLIB`
-#export MAKE=`R CMD config MAKE`
 
-COMPRESSION_LIBS=compression_tools/blosc/libblosc.a
+PKG_LIBS=compression_tools/zstd/libblosc.a compression_tools/zstd/libzstd.a -lz -lstdc++
 
-PKG_LIBS=$(COMPRESSION_LIBS) -lz -lstdc++
+all: $(SHLIB)
 
-all: compression_libs $(SHLIB)
+$(SHLIB): compression_libs
 
-compression_libs: $(COMPRESSION_LIBS)
+compression_libs: libblosc.a libzstd.a
 
-compression_tools/blosc/libblosc.a:
+libblosc.a: libzstd.a
 	$(MAKE) -C compression_tools/blosc
 
+libzstd.a:
+	$(MAKE) -C compression_tools/zstd
+
 clean:
 	$(MAKE) -C blosc clean
diff --git a/src/compression_tools/blosc/Makefile.in b/src/compression_tools/blosc/Makefile.in
@@ -22,8 +22,8 @@ all: libblosc.a
 
 libblosc.a: blosc
 	rm -f libblosc.a
-	ar cq libblosc.a $(BLOSC_OBJS) $(SNAPPY_OBJS) $(LZ4_OBJS)
-	ranlib libblosc.a
+	$(AR) cq libblosc.a $(BLOSC_OBJS) $(SNAPPY_OBJS) $(LZ4_OBJS)
+	$(RANLIB) libblosc.a
 
 blosc: subdirs
 	$(MAKE) -C lib/blosc-1.20.1 all

diff --git a/src/compression_tools/blosc/lib/blosc-1.20.1/Makefile.in b/src/compression_tools/blosc/lib/blosc-1.20.1/Makefile.in
@@ -1,4 +1,4 @@
-EXTRA_FLAGS+=-I../lz4-1.9.2 -I../snappy-1.1.1 -I../zstd-1.4.5 @MSSE2@ @MAVX2@ -DUSING_R
+EXTRA_FLAGS+=-I../lz4-1.9.2 -I../snappy-1.1.1 -I../../../zstd @MSSE2@ @MAVX2@ -DUSING_R
 FLAGS=$(PKG_CFLAGS) $(PKG_CPICFLAGS) $(PKG_CPPFLAGS) $(PKG_R_CPPFLAGS) $(EXTRA_FLAGS)
 
 BLOSC_FILES := $(sort $(wildcard *.c))

diff --git a/src/compression_tools/zstd/Makefile b/src/compression_tools/zstd/Makefile
@@ -16,7 +16,7 @@ all: libzstd.a
 libzstd.a: $(ZSTD_OBJ)
 	rm -f libzstd.a
 	$(AR) cq libzstd.a $(ZSTD_OBJ)
-	ranlib libzstd.a
+	$(RANLIB) libzstd.a
 
 common/debug.o: common/debug.c
 	$(CC) $(FLAGS) -c common/debug.c -o common/debug.o