details: http://hg.nginx.org/nginx/rev/83d54192e97b
branches:
changeset: 6017:83d54192e97b
user: Ruslan Ermilov <r...@nginx.com>
date: Fri Mar 13 19:08:27 2015 +0300
description:
Configure: removed obsolete threads bits.
diffstat:
auto/lib/openssl/make | 5 -----
auto/options | 3 ---
auto/os/freebsd | 19 -------------------
auto/summary | 25 -------------------------
4 files changed, 0 insertions(+), 52 deletions(-)
diffs (96 lines):
diff -r 457ec43dd8d5 -r 83d54192e97b auto/lib/openssl/make
--- a/auto/lib/openssl/make Wed Mar 04 18:26:25 2015 +0300
+++ b/auto/lib/openssl/make Fri Mar 13 19:08:27 2015 +0300
@@ -41,11 +41,6 @@ END
;;
*)
- case $USE_THREADS in
- NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;;
- *) OPENSSL_OPT="$OPENSSL_OPT threads" ;;
- esac
-
case $OPENSSL in
/*) ngx_prefix="$OPENSSL/.openssl" ;;
*) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
diff -r 457ec43dd8d5 -r 83d54192e97b auto/options
--- a/auto/options Wed Mar 04 18:26:25 2015 +0300
+++ b/auto/options Fri Mar 13 19:08:27 2015 +0300
@@ -190,9 +190,6 @@ do
--without-poll_module) EVENT_POLL=NONE ;;
--with-aio_module) EVENT_AIO=YES ;;
- #--with-threads=*) USE_THREADS="$value" ;;
- #--with-threads) USE_THREADS="pthreads" ;;
-
--with-file-aio) NGX_FILE_AIO=YES ;;
--with-ipv6) NGX_IPV6=YES ;;
diff -r 457ec43dd8d5 -r 83d54192e97b auto/os/freebsd
--- a/auto/os/freebsd Wed Mar 04 18:26:25 2015 +0300
+++ b/auto/os/freebsd Fri Mar 13 19:08:27 2015 +0300
@@ -99,25 +99,6 @@ then
fi
-if [ $USE_THREADS = "rfork" ]; then
-
- echo " + using rfork()"
-
-# # kqueue's EVFILT_SIGNAL is safe
-#
-# if [ $version -gt 460101 ]; then
-# echo " + kqueue's EVFILT_SIGNAL is safe"
-# have=NGX_HAVE_SAFE_EVFILT_SIGNAL . auto/have
-# else
-# echo "$0: error: the kqueue's EVFILT_SIGNAL is unsafe on this"
-# echo "FreeBSD version, so --with-threads=rfork could not be used"
-# echo
-#
-# exit 1
-# fi
-fi
-
-
if [ $EVENT_AIO = YES ]; then
if [ \( $version -lt 500000 -a $version -ge 430000 \) \
-o $version -ge 500014 ]
diff -r 457ec43dd8d5 -r 83d54192e97b auto/summary
--- a/auto/summary Wed Mar 04 18:26:25 2015 +0300
+++ b/auto/summary Fri Mar 13 19:08:27 2015 +0300
@@ -3,35 +3,10 @@
# Copyright (C) Nginx, Inc.
-### STUB
-
-if [ $USE_THREADS != NO ]; then
-
-cat << END
-
-$0: error: the threads support is broken now.
-
-END
- exit 1
- fi
-
-###
-
-
echo
echo "Configuration summary"
-#case $USE_THREADS in
-# rfork) echo " + using rfork()ed threads" ;;
-# pthreads) echo " + using libpthread threads library" ;;
-# libthr) echo " + using FreeBSD libthr threads library" ;;
-# libc_r) echo " + using FreeBSD libc_r threads library" ;;
-# linuxthreads) echo " + using FreeBSD LinuxThreads port library" ;;
-# NO) echo " + threads are not used" ;;
-# *) echo " + using lib$USE_THREADS threads library" ;;
-#esac
-
if [ $USE_PCRE = DISABLED ]; then
echo " + PCRE library is disabled"
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel
