Skip to content

Commit

Permalink
Temporarily remove vbz
Browse files Browse the repository at this point in the history
  • Loading branch information
grimbough committed Apr 29, 2023
1 parent 986a445 commit e4b79ab
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
8 changes: 3 additions & 5 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,6 @@ PACKAGE_URL=''

ac_unique_file="src"
ac_subst_vars='ZSTD_LIB
VBZ_LIB
LZF_LIB
BLOSC_LIB
BZIP2_LIB
Expand Down Expand Up @@ -4886,22 +4885,21 @@ fi
BZIP2_LIB="bzip2/libH5Zbz2.so"
BLOSC_LIB="blosc/libH5Zblosc.so"
LZF_LIB="lzf/libH5Zlzf.so"
VBZ_LIB="vbz/libH5Zvbz.so"
#VBZ_LIB="vbz/libH5Zvbz.so"
ZSTD_LIB="zstd/libH5Zzstd.so"
#AC_SUBST(VBZ_LIB)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: BZIP2_LIB=${BZIP2_LIB}" >&5
printf "%s\n" "$as_me: BZIP2_LIB=${BZIP2_LIB}" >&6;}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: BLOSC_LIB=${BLOSC_LIB}" >&5
printf "%s\n" "$as_me: BLOSC_LIB=${BLOSC_LIB}" >&6;}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: LZF_LIB=${LZF_LIB}" >&5
printf "%s\n" "$as_me: LZF_LIB=${LZF_LIB}" >&6;}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: VBZ_LIB=${VBZ_LIB}" >&5
printf "%s\n" "$as_me: VBZ_LIB=${VBZ_LIB}" >&6;}
#AC_MSG_NOTICE([ VBZ_LIB=${VBZ_LIB}])
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ZSTD_LIB=${ZSTD_LIB}" >&5
printf "%s\n" "$as_me: ZSTD_LIB=${ZSTD_LIB}" >&6;}
ac_config_files="$ac_config_files src/Makevars"
Expand Down
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -129,18 +129,18 @@ dnl update variables in Makevars
BZIP2_LIB="bzip2/libH5Zbz2.so"
BLOSC_LIB="blosc/libH5Zblosc.so"
LZF_LIB="lzf/libH5Zlzf.so"
VBZ_LIB="vbz/libH5Zvbz.so"
#VBZ_LIB="vbz/libH5Zvbz.so"
ZSTD_LIB="zstd/libH5Zzstd.so"

AC_SUBST(BZIP2_LIB)
AC_SUBST(BLOSC_LIB)
AC_SUBST(LZF_LIB)
AC_SUBST(VBZ_LIB)
#AC_SUBST(VBZ_LIB)
AC_SUBST(ZSTD_LIB)
AC_MSG_NOTICE([ BZIP2_LIB=${BZIP2_LIB}])
AC_MSG_NOTICE([ BLOSC_LIB=${BLOSC_LIB}])
AC_MSG_NOTICE([ LZF_LIB=${LZF_LIB}])
AC_MSG_NOTICE([ VBZ_LIB=${VBZ_LIB}])
#AC_MSG_NOTICE([ VBZ_LIB=${VBZ_LIB}])
AC_MSG_NOTICE([ ZSTD_LIB=${ZSTD_LIB}])
AC_CONFIG_FILES([src/Makevars])
AC_OUTPUT
12 changes: 6 additions & 6 deletions src/Makevars.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
BZIP2_LIB=@BZIP2_LIB@
BLOSC_LIB=@BLOSC_LIB@
LZF_LIB=@LZF_LIB@
VBZ_LIB=@VBZ_LIB@
#VBZ_LIB=@VBZ_LIB@
ZSTD_LIB=@ZSTD_LIB@

# location to copy the shared objects to
Expand All @@ -22,16 +22,16 @@ export PKG_LDFLAGS=@LDFLAGS@
all: copying $(SHLIB)

#copy hdf5 library headers to package include
copying: libH5Zblosc.so libH5Zbz2.so libH5Zlzf.so libH5Zvbz.so
copying: libH5Zblosc.so libH5Zbz2.so libH5Zlzf.so
mkdir -p "${USER_LIB_DIR}"
cp ${BZIP2_LIB} "${USER_LIB_DIR}"
cp ${BLOSC_LIB} "${USER_LIB_DIR}"
cp ${LZF_LIB} "${USER_LIB_DIR}"
cp ${VBZ_LIB} "${USER_LIB_DIR}"
# cp ${VBZ_LIB} "${USER_LIB_DIR}"
cp ${ZSTD_LIB} "${USER_LIB_DIR}"

libH5Zvbz.so: libH5Zzstd.so
$(MAKE) -C vbz
#libH5Zvbz.so: libH5Zzstd.so
# $(MAKE) -C vbz

libH5Zblosc.so: libH5Zzstd.so
$(MAKE) -C blosc
Expand All @@ -49,5 +49,5 @@ clean:
$(MAKE) -C blosc clean
$(MAKE) -C bzip2 clean
$(MAKE) -C lzf clean
$(MAKE) -C vbz clean
# $(MAKE) -C vbz clean
$(MAKE) -C zstd clean

0 comments on commit e4b79ab

Please sign in to comment.