From 47e531197b18a0e9806bf8e3a2e69f203f5efd13 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Tue, 22 Nov 2022 08:17:28 +0100
Subject: Get rid of the built-in copy of LZ4

On Linux or BSD distributions we have a native version installed
via package manager. On Windows, we can just build it from source
like the other libraries.

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

(limited to 'mkwinbins.sh')

diff --git a/mkwinbins.sh b/mkwinbins.sh
index 5413d0d..76dfaa3 100755
--- a/mkwinbins.sh
+++ b/mkwinbins.sh
@@ -238,6 +238,54 @@ Libs: -L$W64_DIR/lib -lzstd
 Cflags: -I$W64_DIR/include
 _EOF
 
+################################## get lz4 ##################################
+
+PKG_DIR="lz4-1.9.4"
+PKG_TAR="${PKG_DIR}.tar.gz"
+PKG_HASH="0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b"
+
+download
+
+pushd "$PKG_DIR/lib"
+make TARGET_OS=Windows CC=${W32_PREFIX}-gcc WINDRES=${W32_PREFIX}-windres
+mv dll/*.lib "$W32_DIR/lib"
+mv dll/*.dll "$W32_DIR/bin"
+cp *.h "$W32_DIR/include"
+rm *.o *.a
+
+make TARGET_OS=Windows CC=${W64_PREFIX}-gcc WINDRES=${W64_PREFIX}-windres
+mv dll/*.lib "$W64_DIR/lib"
+mv dll/*.dll "$W64_DIR/bin"
+cp *.h "$W64_DIR/include"
+rm *.o *.a
+popd
+
+cat > "$W32_DIR/lib/pkgconfig/liblz4.pc" <<_EOF
+prefix=$W32_DIR
+libdir=$W32_DIR/lib
+includedir=$W32_DIR/include
+
+Name: lz4
+Description: fast lossless compression algorithm library
+URL: https://lz4.github.io/lz4/
+Version: 1.9.4
+Libs: -L$W32_DIR/lib -llz4
+Cflags: -I$W32_DIR/include
+_EOF
+
+cat > "$W64_DIR/lib/pkgconfig/liblz4.pc" <<_EOF
+prefix=$W64_DIR
+libdir=$W64_DIR/lib
+includedir=$W64_DIR/include
+
+Name: lz4
+Description: fast lossless compression algorithm library
+URL: https://lz4.github.io/lz4/
+Version: 1.9.4
+Libs: -L$W64_DIR/lib -llz4
+Cflags: -I$W64_DIR/include
+_EOF
+
 ################################ build 32 bit ################################
 
 export PKG_CONFIG_PATH="$W32_DIR/lib/pkgconfig"
@@ -247,7 +295,7 @@ export PKG_CONFIG_PATH="$W32_DIR/lib/pkgconfig"
 	    LZO_LIBS="-L$W32_DIR/lib -llzo2" \
 	    BZIP2_CFLAGS="-I$W32_DIR/include" \
 	    BZIP2_LIBS="-L$W32_DIR/lib -lbz2" \
-	    --prefix="$W32_DIR" --host="$W32_PREFIX" --with-builtin-lz4
+	    --prefix="$W32_DIR" --host="$W32_PREFIX"
 cp "$W32_DIR/bin/"*.dll .
 make -j check
 rm *.dll
@@ -256,7 +304,7 @@ rm *.dll
 	    LZO_LIBS="-L$W32_DIR/lib -llzo2" \
 	    BZIP2_CFLAGS="-I$W32_DIR/include" \
 	    BZIP2_LIBS="-L$W32_DIR/lib -lbz2" \
-	    --prefix="$W32_DIR" --host="$W32_PREFIX" --with-builtin-lz4
+	    --prefix="$W32_DIR" --host="$W32_PREFIX"
 make clean
 make -j
 make install-strip
@@ -269,7 +317,7 @@ export PKG_CONFIG_PATH="$W64_DIR/lib/pkgconfig"
 	    LZO_LIBS="-L$W64_DIR/lib -llzo2" \
 	    BZIP2_CFLAGS="-I$W64_DIR/include" \
 	    BZIP2_LIBS="-L$W64_DIR/lib -lbz2" \
-	    --prefix="$W64_DIR" --host="$W64_PREFIX" --with-builtin-lz4
+	    --prefix="$W64_DIR" --host="$W64_PREFIX"
 make clean
 cp "$W64_DIR/bin/"*.dll .
 make -j check
@@ -279,7 +327,7 @@ rm *.dll
 	    LZO_LIBS="-L$W64_DIR/lib -llzo2" \
 	    BZIP2_CFLAGS="-I$W64_DIR/include" \
 	    BZIP2_LIBS="-L$W64_DIR/lib -lbz2" \
-	    --prefix="$W64_DIR" --host="$W64_PREFIX" --with-builtin-lz4
+	    --prefix="$W64_DIR" --host="$W64_PREFIX"
 make clean
 make -j
 make install-strip
-- 
cgit v1.2.3