Hakase/nginx-quic
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Hakase/nginx-quic:d4235ff3073f2d5bcf6e57178f8193604ed26f82
Branches Tags
Hakase/nginx-quic:master
...
compare: Hakase/nginx-quic:1e5e7e7421a329a55593c9d3b22322260f28a46c
Branches Tags
Hakase/nginx-quic:master
3 Commits
d4235ff307 ... 1e5e7e7421
Author SHA1 Message Date
Hakase 1e5e7e7421 Fix zlib-ng directory 2023-10-15 00:13:05 +09:00
Hakase 90a56a267a Add zlib-ng library 2023-10-15 00:12:29 +09:00
Hakase d47eb11823 Remove zlib module 2023-10-15 00:07:42 +09:00
4 changed files with 28 additions and 29 deletions
Expand all files Collapse all files
.gitmodules
+3 -4
View File
@@ -13,10 +13,6 @@
[submodule "lib/openssl"] [submodule "lib/openssl"]
path = lib/openssl path = lib/openssl
url = https://github.com/hakasenyang/openssl-custom.git url = https://github.com/hakasenyang/openssl-custom.git
[submodule "lib/zlib"]
path = lib/zlib
url = https://github.com/cloudflare/zlib.git
branch = gcc.amd64
[submodule "lib/ngx_http_geoip2_module"] [submodule "lib/ngx_http_geoip2_module"]
path = lib/ngx_http_geoip2_module path = lib/ngx_http_geoip2_module
url = https://github.com/leev/ngx_http_geoip2_module.git url = https://github.com/leev/ngx_http_geoip2_module.git
@@ -41,3 +37,6 @@
[submodule "lib/zstd-nginx-module"] [submodule "lib/zstd-nginx-module"]
path = lib/zstd-nginx-module path = lib/zstd-nginx-module
url = https://github.com/tokers/zstd-nginx-module url = https://github.com/tokers/zstd-nginx-module
[submodule "lib/zlib-ng"]
path = lib/zlib-ng
url = https://github.com/zlib-ng/zlib-ng
auto.sh
+18 -17
View File
@@ -41,20 +41,20 @@ if [ ! -f "lib/pcre/configure" ]; then
fi fi
### ZLIB reconf ### ZLIB reconf
if [ "$BITCHK" = 64 ]; then #if [ "$BITCHK" = 64 ]; then
if [ ! -f "lib/zlib/Makefile" ]; then # if [ ! -f "lib/zlib/Makefile" ]; then
cd lib/zlib # cd lib/zlib
./configure --64 # ./configure --64
cd ../.. # cd ../..
fi # fi
else #else
if [ ! -f "lib/zlib_x86/Makefile" ]; then # if [ ! -f "lib/zlib_x86/Makefile" ]; then
git submodule add --force https://github.com/madler/zlib.git lib/zlib_x86 # git submodule add --force https://github.com/madler/zlib.git lib/zlib_x86
cd lib/zlib_x86 # cd lib/zlib_x86
./configure # ./configure
cd ../.. # cd ../..
fi # fi
fi #fi
### PSOL Download (PageSpeed) ### PSOL Download (PageSpeed)
if [ ! -d "lib/pagespeed" ] && [ "$PAGESPEED" = 1 ]; then if [ ! -d "lib/pagespeed" ] && [ "$PAGESPEED" = 1 ]; then
@@ -74,12 +74,13 @@ fi
### x86, x64 Check (Configuration) ### x86, x64 Check (Configuration)
if [ "$BITCHK" = 64 ]; then if [ "$BITCHK" = 64 ]; then
BUILD_BIT="-m64 " # Temporary remove
BUILD_ZLIB="./lib/zlib" #BUILD_BIT="-m64 "
BUILD_ZLIB="./lib/zlib-ng"
BUILD_LD="-lrt -ljemalloc -Wl,-z,relro -Wl,-z,now -fPIC" BUILD_LD="-lrt -ljemalloc -Wl,-z,relro -Wl,-z,now -fPIC"
else else
BUILD_BIT="" BUILD_BIT=""
BUILD_ZLIB="./lib/zlib_x86" BUILD_ZLIB="./lib/zlib-ng"
BUILD_LD="" BUILD_LD=""
fi fi
auto/lib/zlib/make
+7 -7
View File
@@ -52,7 +52,7 @@ END
$ZLIB/libz.a: $NGX_MAKEFILE $ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\ cd $ZLIB \\
&& \$(MAKE) distclean \\ && \$(MAKE) clean \\
&& \$(MAKE) -f win32/Makefile.gcc \\ && \$(MAKE) -f win32/Makefile.gcc \\
CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\ CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
libz.a libz.a
@@ -75,10 +75,10 @@ END
$ZLIB/libz.a: $NGX_MAKEFILE $ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\ cd $ZLIB \\
&& \$(MAKE) distclean \\ && \$(MAKE) clean \\
&& cp contrib/asm586/match.S . \\ && cp contrib/asm586/match.S . \\
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\ && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
./configure \\ ./configure --zlib-compat \\
&& \$(MAKE) OBJA=match.o libz.a && \$(MAKE) OBJA=match.o libz.a
END END
@@ -92,10 +92,10 @@ END
$ZLIB/libz.a: $NGX_MAKEFILE $ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\ cd $ZLIB \\
&& \$(MAKE) distclean \\ && \$(MAKE) clean \\
&& cp contrib/asm686/match.S . \\ && cp contrib/asm686/match.S . \\
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\ && CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
./configure \\ ./configure --zlib-compat \\
&& \$(MAKE) OBJA=match.o libz.a && \$(MAKE) OBJA=match.o libz.a
END END
@@ -125,9 +125,9 @@ if [ $done = NO ]; then
$ZLIB/libz.a: $NGX_MAKEFILE $ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\ cd $ZLIB \\
&& \$(MAKE) distclean \\ && \$(MAKE) clean \\
&& CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\ && CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
./configure \\ ./configure --zlib-compat \\
&& \$(MAKE) libz.a && \$(MAKE) libz.a
END END
lib/zlib
-1
Submodule lib/zlib deleted from d213e64378