mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 09:42:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

auto/lib/zlib: add --with-zlib-conf-opt and skip missing distclean

Browse Source 
The build system had two issues when zlib-ng is used:
1. `distclean` was always invoked, causing failure on first run
   when no Makefile exists yet.
2. There was no way to pass options like --zlib-compat to zlib's
   ./configure; users tried to sneak them in via CFLAGS which
   triggers "compiler error reporting is too harsh" and aborts.

The new --with-zlib-conf-opt=<opts> option feeds its value
directly to ./configure, and `distclean` is now executed only
if a Makefile is present.
This commit is contained in:
catatsuy 2025-04-19 20:39:25 +09:00
parent 020b1db7eb
commit 4e2cc51723
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
auto/lib/zlib/make
View File

@ -52,7 +52,7 @@ END
$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
&& \$(MAKE) distclean \\
&& if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
&& \$(MAKE) -f win32/Makefile.gcc \\
CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
libz.a
@ -75,10 +75,10 @@ END
$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
&& \$(MAKE) distclean \\
&& if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
&& cp contrib/asm586/match.S . \\
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
./configure \\
./configure $ZLIB_CONF_OPT \\
&& \$(MAKE) OBJA=match.o libz.a
END
@ -92,10 +92,10 @@ END
$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
&& \$(MAKE) distclean \\
&& if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
&& cp contrib/asm686/match.S . \\
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
./configure \\
./configure $ZLIB_CONF_OPT \\
&& \$(MAKE) OBJA=match.o libz.a
END
@ -125,9 +125,9 @@ if [ $done = NO ]; then
$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
&& \$(MAKE) distclean \\
&& if [ -f Makefile ]; then \$(MAKE) distclean; fi \\
&& CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
./configure \\
./configure $ZLIB_CONF_OPT \\
&& \$(MAKE) libz.a
END

1
auto/options
View File

@ -402,6 +402,7 @@ $0: warning: the \"--with-sha1-asm\" option is deprecated"
--with-zlib=*) ZLIB="$value" ;;
--with-zlib-opt=*) ZLIB_OPT="$value" ;;
--with-zlib-conf-opt=*) ZLIB_CONF_OPT="$value" ;;
--with-zlib-asm=*) ZLIB_ASM="$value" ;;
--with-libatomic) NGX_LIBATOMIC=YES ;;