From 113b174c5807f76cb14cfed7a8f86a299393666e Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Fri, 27 Dec 2019 11:44:20 +0100
Subject: Add a small version of liblz4 that can be built in statically

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
---
 mkwinbins.sh | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

(limited to 'mkwinbins.sh')

diff --git a/mkwinbins.sh b/mkwinbins.sh
index ef899eb..efb1411 100755
--- a/mkwinbins.sh
+++ b/mkwinbins.sh
@@ -100,36 +100,6 @@ make -j
 make install-strip
 popd
 
-################################## get lz4 ###################################
-
-PKG_DIR="lz4-1.9.2"
-PKG_TAR="${PKG_DIR}.tar.gz"
-PKG_HASH="658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc"
-
-download
-
-pushd "$PKG_DIR"
-make -j BUILD_STATIC="no" BUILD_SHARED="yes" CC="${W32_PREFIX}-gcc" \
-     DLLTOOL="${W32_PREFIX}-dlltool" WINDRES="${W32_PREFIX}-windres" \
-     OS="Windows_NT" WINBASED="yes" PREFIX="$W32_DIR" \
-     lib-release
-make BUILD_STATIC="no" BUILD_SHARED="yes" CC="${W32_PREFIX}-gcc" \
-     DLLTOOL="${W32_PREFIX}-dlltool" WINDRES="${W32_PREFIX}-windres" \
-     OS="Windows_NT" WINBASED="yes" PREFIX="$W32_DIR" \
-     -C "lib" install
-
-make clean
-
-make -j BUILD_STATIC="no" BUILD_SHARED="yes" CC="${W64_PREFIX}-gcc" \
-     DLLTOOL="${W64_PREFIX}-dlltool" WINDRES="${W64_PREFIX}-windres" \
-     OS="Windows_NT" WINBASED="yes" PREFIX="$W64_DIR" \
-     lib-release
-make BUILD_STATIC="no" BUILD_SHARED="yes" CC="${W64_PREFIX}-gcc" \
-     DLLTOOL="${W64_PREFIX}-dlltool" WINDRES="${W64_PREFIX}-windres" \
-     OS="Windows_NT" WINBASED="yes" PREFIX="$W64_DIR" \
-     -C "lib" install
-popd
-
 ################################## get zstd ##################################
 
 PKG_DIR="zstd-v1.4.4-win32"
@@ -181,14 +151,14 @@ _EOF
 ./autogen.sh
 ./configure CFLAGS="-O2" LZO_CFLAGS="-I$W32_DIR/include" \
 	    LZO_LIBS="-L$W32_DIR/lib -llzo2" \
-	    --prefix="$W32_DIR" --host="$W32_PREFIX"
+	    --prefix="$W32_DIR" --host="$W32_PREFIX" --with-builtin-lz4
 cp "$W32_DIR/bin/"*.dll .
 make -j check
 rm *.dll
 
 ./configure CFLAGS="-O2 -DNDEBUG" LZO_CFLAGS="-I$W32_DIR/include" \
 	    LZO_LIBS="-L$W32_DIR/lib -llzo2" \
-	    --prefix="$W32_DIR" --host="$W32_PREFIX"
+	    --prefix="$W32_DIR" --host="$W32_PREFIX" --with-builtin-lz4
 make clean
 make -j
 make install-strip
@@ -197,7 +167,7 @@ make install-strip
 
 ./configure CFLAGS="-O2" LZO_CFLAGS="-I$W64_DIR/include" \
 	    LZO_LIBS="-L$W64_DIR/lib -llzo2" \
-	    --prefix="$W64_DIR" --host="$W64_PREFIX"
+	    --prefix="$W64_DIR" --host="$W64_PREFIX" --with-builtin-lz4
 make clean
 cp "$W64_DIR/bin/"*.dll .
 make -j check
@@ -205,7 +175,7 @@ rm *.dll
 
 ./configure CFLAGS="-O2 -DNDEBUG" LZO_CFLAGS="-I$W64_DIR/include" \
 	    LZO_LIBS="-L$W64_DIR/lib -llzo2" \
-	    --prefix="$W64_DIR" --host="$W64_PREFIX"
+	    --prefix="$W64_DIR" --host="$W64_PREFIX" --with-builtin-lz4
 make clean
 make -j
 make install-strip
-- 
cgit v1.2.3