mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-03 04:39:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
7ea2fb6cb1
nginx/auto/lib/zlib/make

136 lines
2.5 KiB
Plaintext
Raw Normal View History

nginx-0.0.2-2004-03-01-23:00:04 import
2004-03-02 04:00:04 +08:00
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
2004-09-30 00:00:49 +08:00
# Copyright (C) Igor Sysoev
Copyright updated.
2012-01-18 23:07:43 +08:00
# Copyright (C) Nginx, Inc.
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
2004-09-30 00:00:49 +08:00
nginx-0.1.8-RELEASE import *) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive.
2004-11-21 03:52:20 +08:00
case "$NGX_CC_NAME" in
nginx-0.0.2-2004-03-09-22:47:07 import
2004-03-10 03:47:07 +08:00
Win32: simplified and improved handling of MSVC versions. Now we always set NGX_CC_NAME to "msvc", and additionally test compiler version as reported by "cl" in auto/cc/msvc (the same version is also available via the _MSC_VER define). In particular, this approach allows to properly check for C99 variadic macros support, which previously was not used with MSVC versions not explicitly recognized. Now unneeded wildcards in NGX_CC_NAME tests for msvc removed accordingly, as well as unused wildcards for owc and icc.
2016-02-13 11:47:34 +08:00
msvc)
nginx-0.1.8-RELEASE import *) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive.
2004-11-21 03:52:20 +08:00
ngx_makefile=makefile.msvc
nginx-0.1.26-RELEASE import *) Change: the invalid client header lines are now ignored and logged at the info level. *) Change: the server name is also logged in error log. *) Feature: the ngx_http_auth_basic_module module and the auth_basic and auth_basic_user_file directives.
2005-03-23 00:02:46 +08:00
ngx_opt="CPU_OPT=\"$CPU_OPT\" LIBC=$LIBC"
backout r2833: CURDIR was set to Unix style path instead, do chdir inside Makefile
2009-05-12 21:15:43 +08:00
ngx_zlib="ZLIB=\"$ZLIB\""
nginx-0.0.3-2004-03-29-21:43:58 import
2004-03-30 01:43:58 +08:00
nginx-0.0.2-2004-03-09-22:47:07 import
2004-03-10 03:47:07 +08:00
;;
Win32: simplified and improved handling of MSVC versions. Now we always set NGX_CC_NAME to "msvc", and additionally test compiler version as reported by "cl" in auto/cc/msvc (the same version is also available via the _MSC_VER define). In particular, this approach allows to properly check for C99 variadic macros support, which previously was not used with MSVC versions not explicitly recognized. Now unneeded wildcards in NGX_CC_NAME tests for msvc removed accordingly, as well as unused wildcards for owc and icc.
2016-02-13 11:47:34 +08:00
owc)
nginx-0.1.8-RELEASE import *) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive.
2004-11-21 03:52:20 +08:00
ngx_makefile=makefile.owc
nginx-0.1.26-RELEASE import *) Change: the invalid client header lines are now ignored and logged at the info level. *) Change: the server name is also logged in error log. *) Feature: the ngx_http_auth_basic_module module and the auth_basic and auth_basic_user_file directives.
2005-03-23 00:02:46 +08:00
ngx_opt="CPU_OPT=\"$CPU_OPT\""
backout r2833: CURDIR was set to Unix style path instead, do chdir inside Makefile
2009-05-12 21:15:43 +08:00
ngx_zlib=`echo ZLIB=\"$ZLIB\" | sed -e "s/\//$ngx_regex_dirsep/g"`
nginx-0.0.3-2004-03-29-21:43:58 import
2004-03-30 01:43:58 +08:00
;;
nginx-0.1.8-RELEASE import *) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive.
2004-11-21 03:52:20 +08:00
bcc)
ngx_makefile=makefile.bcc
nginx-0.1.26-RELEASE import *) Change: the invalid client header lines are now ignored and logged at the info level. *) Change: the server name is also logged in error log. *) Feature: the ngx_http_auth_basic_module module and the auth_basic and auth_basic_user_file directives.
2005-03-23 00:02:46 +08:00
ngx_opt="-DCPU_OPT=\"$CPU_OPT\""
backout r2833: CURDIR was set to Unix style path instead, do chdir inside Makefile
2009-05-12 21:15:43 +08:00
ngx_zlib=`echo \-DZLIB=\"$ZLIB\" | sed -e "s/\//$ngx_regex_dirsep/g"`
nginx-0.0.2-2004-03-09-22:47:07 import
2004-03-10 03:47:07 +08:00
;;
Win32: MinGW GCC compatibility. Several warnings silenced, notably (ngx_socket_t) -1 is now checked on socket operations instead of -1, as ngx_socket_t is unsigned on win32 and gcc complains on comparison. With this patch, it's now possible to compile nginx using mingw gcc, with options we normally compile on win32.
2013-09-05 00:48:28 +08:00
*)
ngx_makefile=
;;
nginx-0.0.2-2004-03-09-22:47:07 import
2004-03-10 03:47:07 +08:00
esac
nginx-0.0.2-2004-03-12-00:34:52 import
2004-03-12 05:34:52 +08:00
done=NO
nginx-0.1.21-RELEASE import *) 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.
2005-02-22 22:40:13 +08:00
case "$NGX_PLATFORM" in
nginx-0.0.2-2004-03-09-22:47:07 import
2004-03-10 03:47:07 +08:00
win32)
Win32: MinGW GCC compatibility. Several warnings silenced, notably (ngx_socket_t) -1 is now checked on socket operations instead of -1, as ngx_socket_t is unsigned on win32 and gcc complains on comparison. With this patch, it's now possible to compile nginx using mingw gcc, with options we normally compile on win32.
2013-09-05 00:48:28 +08:00
if [ -n "$ngx_makefile" ]; then
cat << END >> $NGX_MAKEFILE
nginx-0.0.2-2004-03-09-22:47:07 import
2004-03-10 03:47:07 +08:00
nginx-0.1.8-RELEASE import *) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive.
2004-11-21 03:52:20 +08:00
`echo "$ZLIB/zlib.lib: $NGX_MAKEFILE" | sed -e "s/\//$ngx_regex_dirsep/g"`
backout r2833: CURDIR was set to Unix style path instead, do chdir inside Makefile
2009-05-12 21:15:43 +08:00
\$(MAKE) -f auto/lib/zlib/$ngx_makefile $ngx_opt $ngx_zlib
nginx-0.1.8-RELEASE import *) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive.
2004-11-21 03:52:20 +08:00
END
nginx-0.0.2-2004-03-12-00:34:52 import
2004-03-12 05:34:52 +08:00
Win32: MinGW GCC compatibility. Several warnings silenced, notably (ngx_socket_t) -1 is now checked on socket operations instead of -1, as ngx_socket_t is unsigned on win32 and gcc complains on comparison. With this patch, it's now possible to compile nginx using mingw gcc, with options we normally compile on win32.
2013-09-05 00:48:28 +08:00
else
cat << END >> $NGX_MAKEFILE
$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
&& \$(MAKE) distclean \\
&& \$(MAKE) -f win32/Makefile.gcc \\
CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
libz.a
END
fi
nginx-0.0.2-2004-03-12-00:34:52 import
2004-03-12 05:34:52 +08:00
done=YES
nginx-0.0.2-2004-03-09-22:47:07 import
2004-03-10 03:47:07 +08:00
;;
nginx-0.0.2-2004-03-12-19:57:08 import
2004-03-13 00:57:08 +08:00
# FreeBSD: i386
# Linux: i686
nginx-0.0.2-2004-03-09-22:47:07 import
2004-03-10 03:47:07 +08:00
nginx-0.0.2-2004-03-10-20:55:19 import
2004-03-11 01:55:19 +08:00
*:i386 | *:i686)
nginx-0.0.2-2004-03-12-19:57:08 import
2004-03-13 00:57:08 +08:00
case $ZLIB_ASM in
pentium)
nginx-0.1.8-RELEASE import *) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive.
2004-11-21 03:52:20 +08:00
cat << END >> $NGX_MAKEFILE
$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
zlib 1.2.4 compatibility
2010-03-25 18:07:38 +08:00
&& \$(MAKE) distclean \\
nginx-0.1.8-RELEASE import *) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive.
2004-11-21 03:52:20 +08:00
&& cp contrib/asm586/match.S . \\
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
./configure \\
&& \$(MAKE) OBJA=match.o libz.a
END
nginx-0.0.2-2004-03-12-19:57:08 import
2004-03-13 00:57:08 +08:00
done=YES
;;
pentiumpro)
nginx-0.1.8-RELEASE import *) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive.
2004-11-21 03:52:20 +08:00
cat << END >> $NGX_MAKEFILE
$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
zlib 1.2.4 compatibility
2010-03-25 18:07:38 +08:00
&& \$(MAKE) distclean \\
nginx-0.1.8-RELEASE import *) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive.
2004-11-21 03:52:20 +08:00
&& cp contrib/asm686/match.S . \\
&& CFLAGS="$ZLIB_OPT -DASMV" CC="\$(CC)" \\
./configure \\
&& \$(MAKE) OBJA=match.o libz.a
END
nginx-0.0.2-2004-03-12-19:57:08 import
2004-03-13 00:57:08 +08:00
done=YES
;;
nginx-0.0.3-2004-04-12-20:38:09 import
2004-04-13 00:38:09 +08:00
nginx-0.0.3-2004-04-18-23:06:02 import
2004-04-19 03:06:02 +08:00
NO)
;;
nginx-0.0.3-2004-04-12-20:38:09 import
2004-04-13 00:38:09 +08:00
*)
nginx-0.0.3-2004-04-18-23:06:02 import
2004-04-19 03:06:02 +08:00
echo "$0: error: invalid --with-zlib-asm=$ZLIB_ASM option."
nginx-0.0.3-2004-04-12-20:38:09 import
2004-04-13 00:38:09 +08:00
echo "The valid values are \"pentium\" and \"pentiumpro\" only".
echo
exit 1;
;;
nginx-0.0.2-2004-03-12-19:57:08 import
2004-03-13 00:57:08 +08:00
esac
nginx-0.0.2-2004-03-01-23:00:04 import
2004-03-02 04:00:04 +08:00
;;
esac
nginx-0.0.2-2004-03-12-00:34:52 import
2004-03-12 05:34:52 +08:00
if [ $done = NO ]; then
nginx-0.1.8-RELEASE import *) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive.
2004-11-21 03:52:20 +08:00
cat << END >> $NGX_MAKEFILE
$ZLIB/libz.a: $NGX_MAKEFILE
cd $ZLIB \\
zlib 1.2.4 compatibility
2010-03-25 18:07:38 +08:00
&& \$(MAKE) distclean \\
nginx-0.1.8-RELEASE import *) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive.
2004-11-21 03:52:20 +08:00
&& CFLAGS="$ZLIB_OPT" CC="\$(CC)" \\
./configure \\
&& \$(MAKE) libz.a
nginx-0.0.2-2004-03-12-00:34:52 import
2004-03-12 05:34:52 +08:00
nginx-0.1.8-RELEASE import *) Bugfix: in the ngx_http_autoindex_module if the long file names were in the listing. *) Feature: the "^~" modifier in the location directive. *) Feature: the proxy_max_temp_file_size directive.
2004-11-21 03:52:20 +08:00
END
fi
Reference in New Issue Copy Permalink