Add ZSTD to Windows build

diff --git a/bacula/src/win32/External-mingw-w64 b/bacula/src/win32/External-mingw-w64
index ad921ae08ba5d30a788d15ebecafc3556c3fbfff..28f8b757161b470deb8bf1d96a56c2ac7c04ecce 100644 (file)
--- a/bacula/src/win32/External-mingw-w64
+++ b/bacula/src/win32/External-mingw-w64
@@ -41,6 +41,7 @@ Qt5|http://download.qt.io/archive/qt/5.14/5.14.2/single/qt-everywhere-src-5.14.2
 #WX|http://www.bacula.org/depkgs-mingw32/wxWidgets-2.8.7.tar.gz
 ZLIB|https://www.baculasystems.com/dl/Depkgs-mingw32-6.6-paa9aiMa/zlib-1.2.8.tar.gz
 LZO|https://www.baculasystems.com/dl/Depkgs-mingw32-6.6-paa9aiMa/lzo-2.10.tar.gz
+ZSTD|https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz
 # 
 # 
 # Original file locations

diff --git a/bacula/src/win32/External-mingw32 b/bacula/src/win32/External-mingw32
index a448870afdb11bbe41ae8337aeb6d319c7c2b79f..c1cf33060b515093a874045d7c6e5489fe4361e6 100644 (file)
--- a/bacula/src/win32/External-mingw32
+++ b/bacula/src/win32/External-mingw32
@@ -41,6 +41,7 @@ STAB2CV|https://www.baculasystems.com/dl/Depkgs-mingw32-6.6-paa9aiMa/stab2cv-0.1
 WX|http://www.bacula.org/depkgs-mingw32/wxWidgets-2.8.7.tar.gz
 ZLIB|https://www.baculasystems.com/dl/Depkgs-mingw32-6.6-paa9aiMa/zlib-1.2.8.tar.gz
 LZO|https://www.baculasystems.com/dl/Depkgs-mingw32-6.6-paa9aiMa/lzo-2.10.tar.gz
+ZSTD|https://github.com/facebook/zstd/releases/download/v1.5.0/zstd-1.5.0.tar.gz
 # 
 # 
 # Original file locations

diff --git a/bacula/src/win32/build-depkgs-mingw-w64 b/bacula/src/win32/build-depkgs-mingw-w64
index e5e277f277658bc702878651f145fe950e6d1243..23fd27be86ef276b727239ce609cdf24f5e31da8 100755 (executable)
--- a/bacula/src/win32/build-depkgs-mingw-w64
+++ b/bacula/src/win32/build-depkgs-mingw-w64
@@ -417,6 +417,16 @@ process_cmd_utils()
 }
 
 
+process_zstd()
+{
+   echo Installing ZSTD
+   get_source "$URL_ZSTD" "$DIR_ZSTD" "$MKD_ZSTD"
+   CC=x86_64-w64-mingw32-gcc make TARGET_SYSTEM=Windows
+   cp  lib/libzstd.a $DEPPKG_DIR/lib
+   cp  lib/*.h $DEPPKG_DIR/include
+}
+
+
 if [ "$#" -eq 0 ]
 then
    process_mingw
@@ -428,6 +438,7 @@ then
    process_qt5
    process_sed
    process_cmd_utils
+   process_zstd
 #   process_mtx
 #   process_mt
 else

diff --git a/bacula/src/win32/build-depkgs-mingw32 b/bacula/src/win32/build-depkgs-mingw32
index 1d838218499060b2a464742a77cf5b3bc91ea028..503713fc3f06aa2ae1ffc870df8c198c4e9aacff 100755 (executable)
--- a/bacula/src/win32/build-depkgs-mingw32
+++ b/bacula/src/win32/build-depkgs-mingw32
@@ -641,6 +641,15 @@ process_mingw()
    fi
 }
 
+process_zstd()
+{
+   echo Installing ZSTD
+   get_source "$URL_ZSTD" "$DIR_ZSTD" "$MKD_ZSTD"
+   CC=i686-w64-mingw32-gcc make TARGET_SYSTEM=Windows
+   cp  lib/libzstd.a $DEPPKG_DIR/lib
+   cp  lib/*.h $DEPPKG_DIR/include
+}
+
 if [ "$#" -eq 0 ]
 then
    process_mingw
@@ -651,6 +660,7 @@ then
    process_stab2cv
    process_sed
    process_cmd_utils
+   process_zstd
 #   process_pcre
 #   process_mysql
 #   process_sqlite

diff --git a/bacula/src/win32/filed/Makefile b/bacula/src/win32/filed/Makefile
index 0c716c2e8147d049d4d848980c342ec4d3cff44c..3477b8e7b95e7bece31429242c938c9681aa86cb 100644 (file)
--- a/bacula/src/win32/filed/Makefile
+++ b/bacula/src/win32/filed/Makefile
@@ -96,6 +96,7 @@ FILED_LIBS = \
        $(LIBS_PTHREADS) \
        $(LIBS_ZLIB) \
        $(LIBS_LZO) \
+       $(LIBS_ZSTD) \
        $(LIBS_NETWORK) \
        -lole32 \
        -loleaut32 \

diff --git a/bacula/src/win32/stored/Makefile b/bacula/src/win32/stored/Makefile
index ca77df3d2775e5d00efa73984a188986ce5b5eb9..ddc9fb8b326bbd7e1ec6bdceac06765f75b96816 100644 (file)
--- a/bacula/src/win32/stored/Makefile
+++ b/bacula/src/win32/stored/Makefile
@@ -171,7 +171,7 @@ $(BINDIR)/btape.exe: $(OBJDIR)/btape.o $(COMMON_OBJS) $(LIBS_BACULA)
 $(BINDIR)/bls.exe: $(OBJDIR)/bls.o $(EXTRA_BLS_OBJS) $(COMMON_OBJS) $(LIBS_BACULA)
        $(call link_conapp,$(LIBS_STORED))
 
-$(BINDIR)/bextract.exe: $(BEXTRACT_OBJS) $(COMMON_OBJS) $(LIBS_BACULA) $(LIBS_LZO)
+$(BINDIR)/bextract.exe: $(BEXTRACT_OBJS) $(COMMON_OBJS) $(LIBS_BACULA) $(LIBS_LZO) $(LIBS_ZSTD)
        $(call link_conapp,$(LIBS_STORED) $(LIBS_ZLIB))
 
 $(BINDIR)/bscan.exe: $(OBJDIR)/bscan.o $(COMMON_OBJS) $(LIBS_CATS) $(LIBS_BACULA)