mirror of
https://github.com/nginx/nginx.git
synced 2024-12-04 13:59:00 +08:00
d039a2e193
*) Bugfix: the ngx_http_stub_status_module showed incorrect statistics
if "rtsig" method was used or if several worker process ran on SMP.
*) Bugfix: nginx could not be built by the icc compiler on Linux or if
the zlib-1.2.x library was building from sources.
*) Bugfix: nginx could not be built on NetBSD 2.0.
115 lines
2.0 KiB
Plaintext
115 lines
2.0 KiB
Plaintext
|
|
# Copyright (C) Igor Sysoev
|
|
|
|
|
|
case "$NGX_CC_NAME" in
|
|
|
|
msvc*)
|
|
ngx_makefile=makefile.msvc
|
|
ngx_opt="CPU_OPT=$CPU_OPT LIBC=$LIBC"
|
|
|
|
;;
|
|
|
|
owc*)
|
|
ngx_makefile=makefile.owc
|
|
ngx_opt="CPU_OPT=$CPU_OPT"
|
|
;;
|
|
|
|
bcc)
|
|
ngx_makefile=makefile.bcc
|
|
ngx_opt="-DCPU_OPT=$CPU_OPT"
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
done=NO
|
|
|
|
|
|
case "$NGX_PLATFORM" in
|
|
|
|
win32)
|
|
cp auto/lib/zlib/$ngx_makefile $ZLIB
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
`echo "$ZLIB/zlib.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
cd `echo $ZLIB | sed -e "s/\//$ngx_regex_dirsep/g"`
|
|
\$(MAKE) -f $ngx_makefile $ngx_opt
|
|
cd ..\\..\\..
|
|
|
|
END
|
|
|
|
done=YES
|
|
;;
|
|
|
|
# FreeBSD: i386
|
|
# Linux: i686
|
|
|
|
*:i386 | *:i686)
|
|
case $ZLIB_ASM in
|
|
pentium)
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
$ZLIB/libz.a: $NGX_MAKEFILE
|
|
cd $ZLIB \\
|
|
&& \$(MAKE) clean \\
|
|
&& cp contrib/asm586/match.S . \\
|
|
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
|
|
./configure \\
|
|
&& \$(MAKE) OBJA=match.o libz.a
|
|
|
|
END
|
|
|
|
done=YES
|
|
;;
|
|
|
|
pentiumpro)
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
$ZLIB/libz.a: $NGX_MAKEFILE
|
|
cd $ZLIB \\
|
|
&& \$(MAKE) clean \\
|
|
&& cp contrib/asm686/match.S . \\
|
|
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
|
|
./configure \\
|
|
&& \$(MAKE) OBJA=match.o libz.a
|
|
|
|
END
|
|
|
|
done=YES
|
|
;;
|
|
|
|
NO)
|
|
;;
|
|
|
|
*)
|
|
echo "$0: error: invalid --with-zlib-asm=$ZLIB_ASM option."
|
|
echo "The valid values are \"pentium\" and \"pentiumpro\" only".
|
|
echo
|
|
|
|
exit 1;
|
|
;;
|
|
esac
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
if [ $done = NO ]; then
|
|
|
|
cat << END >> $NGX_MAKEFILE
|
|
|
|
$ZLIB/libz.a: $NGX_MAKEFILE
|
|
cd $ZLIB \\
|
|
&& \$(MAKE) clean \\
|
|
&& CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
|
|
./configure \\
|
|
&& \$(MAKE) libz.a
|
|
|
|
END
|
|
|
|
fi
|