diff --git a/.gitignore b/.gitignore index 74b81462..29577f5b 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ plugins/ ### Natives stuff ### native/mbedtls native/zlib-ng +native/zlib-cf diff --git a/native/compile-linux-amd64.sh b/native/compile-linux-amd64.sh index 423e4c52..4ff94848 100755 --- a/native/compile-linux-amd64.sh +++ b/native/compile-linux-amd64.sh @@ -1,21 +1,21 @@ #!/bin/bash -if [ ! -d zlib-ng ]; then - echo "Cloning zlib-ng..." - git clone https://github.com/zlib-ng/zlib-ng.git +if [ ! -d zlib-cf ]; then + echo "Cloning Cloudflare zlib..." + git clone -b gcc.amd64 https://github.com/cloudflare/zlib.git zlib-cf fi -echo "Compiling zlib-ng..." -cd zlib-ng -CFLAGS="-fPIC -O3 -mtune=skylake -flto" AR=gcc-ar RANLIB=gcc-ranlib ./configure --zlib-compat --static -make clean && make -cd .. +#echo "Compiling Cloudflare zlib..." +#cd zlib-cf +#CFLAGS="-fPIC -O3 -mtune=skylake -flto" AR=gcc-ar RANLIB=gcc-ranlib ./configure --static +#make clean && make +#cd .. # Modify as you need. MBEDTLS_ROOT=mbedtls CFLAGS="-O3 -I$JAVA_HOME/include/ -I$JAVA_HOME/include/linux/ -fPIC -shared -mtune=skylake -flto" -gcc $CFLAGS -Izlib-ng src/main/c/jni_util.c src/main/c/jni_zlib_deflate.c src/main/c/jni_zlib_inflate.c \ - src/main/c/jni_zlib_common.c zlib-ng/libz.a -o src/main/resources/linux_x64/velocity-compress.so +gcc $CFLAGS -Izlib-cf src/main/c/jni_util.c src/main/c/jni_zlib_deflate.c src/main/c/jni_zlib_inflate.c \ + src/main/c/jni_zlib_common.c zlib-cf/libz.a -Wl,-z,noexecstack -o src/main/resources/linux_x64/velocity-compress.so gcc $CFLAGS -I $MBEDTLS_ROOT/include -shared $MBEDTLS_ROOT/library/aes.c $MBEDTLS_ROOT/library/aesni.c \ $MBEDTLS_ROOT/library/platform.c $MBEDTLS_ROOT/library/platform_util.c src/main/c/jni_util.c src/main/c/jni_cipher.c \ -o src/main/resources/linux_x64/velocity-cipher.so diff --git a/native/src/main/resources/linux_x64/velocity-compress.so b/native/src/main/resources/linux_x64/velocity-compress.so index acd8b876..8ee06c34 100755 Binary files a/native/src/main/resources/linux_x64/velocity-compress.so and b/native/src/main/resources/linux_x64/velocity-compress.so differ