[Python-checkins] cpython: remove --with(out)-signal-module, since the signal module is non-optional
benjamin.peterson
python-checkins at python.org
Fri Sep 9 15:01:34 EDT 2016
https://hg.python.org/cpython/rev/d5bb5ad5a108
changeset: 103436:d5bb5ad5a108
parent: 103434:eba19d4b2944
user: Benjamin Peterson <benjamin at python.org>
date: Fri Sep 09 12:01:10 2016 -0700
summary:
remove --with(out)-signal-module, since the signal module is non-optional
files:
Makefile.pre.in | 7 +-----
Modules/Setup.config.in | 3 --
Modules/Setup.dist | 1 +
configure | 30 -----------------------------
configure.ac | 20 -------------------
5 files changed, 2 insertions(+), 59 deletions(-)
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -254,9 +254,6 @@
Modules/main.o \
Modules/gcmodule.o
-# Used of signalmodule.o is not available
-SIGNAL_OBJS= @SIGNAL_OBJS@
-
IO_H= Modules/_io/_iomodule.h
IO_OBJS= \
@@ -448,7 +445,6 @@
$(OBJECT_OBJS) \
$(PYTHON_OBJS) \
$(MODULE_OBJS) \
- $(SIGNAL_OBJS) \
$(MODOBJS)
LIBRARY_OBJS= \
@@ -598,7 +594,7 @@
$(AR) $(ARFLAGS) $@ $(PARSER_OBJS)
$(AR) $(ARFLAGS) $@ $(OBJECT_OBJS)
$(AR) $(ARFLAGS) $@ $(PYTHON_OBJS) Python/frozen.o
- $(AR) $(ARFLAGS) $@ $(MODULE_OBJS) $(SIGNAL_OBJS)
+ $(AR) $(ARFLAGS) $@ $(MODULE_OBJS)
$(AR) $(ARFLAGS) $@ $(MODOBJS)
$(RANLIB) $@
@@ -718,7 +714,6 @@
$(OBJECT_OBJS) \
$(PYTHON_OBJS) \
$(MODULE_OBJS) \
- $(SIGNAL_OBJS) \
$(MODOBJS) \
$(srcdir)/Modules/getbuildinfo.c
$(CC) -c $(PY_CORE_CFLAGS) \
diff --git a/Modules/Setup.config.in b/Modules/Setup.config.in
--- a/Modules/Setup.config.in
+++ b/Modules/Setup.config.in
@@ -6,8 +6,5 @@
# Threading
@USE_THREAD_MODULE at _thread _threadmodule.c
-# The signal module
- at USE_SIGNAL_MODULE@_signal signalmodule.c
-
# The rest of the modules previously listed in this file are built
# by the setup.py script in Python 2.1 and later.
diff --git a/Modules/Setup.dist b/Modules/Setup.dist
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -117,6 +117,7 @@
_collections _collectionsmodule.c # Container types
itertools itertoolsmodule.c # Functions creating iterators for efficient looping
atexit atexitmodule.c # Register functions to be run at interpreter-shutdown
+_signal signalmodule.c
_stat _stat.c # stat.h interface
time timemodule.c # -lm # time operations and variables
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -645,8 +645,6 @@
THREADOBJ
LDLAST
USE_THREAD_MODULE
-SIGNAL_OBJS
-USE_SIGNAL_MODULE
TCLTK_LIBS
TCLTK_INCLUDES
LIBFFI_INCLUDEDIR
@@ -828,7 +826,6 @@
with_tcltk_includes
with_tcltk_libs
with_dbmliborder
-with_signal_module
with_threads
with_thread
enable_ipv6
@@ -1532,7 +1529,6 @@
order to check db backends for dbm. Valid value is a
colon separated string with the backend names
`ndbm', `gdbm' and `bdb'.
- --with-signal-module disable/enable signal module
--with(out)-threads[=DIRECTORY]
disable/enable thread support
--with(out)-thread[=DIRECTORY]
@@ -9964,32 +9960,6 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dbmliborder" >&5
$as_echo "$with_dbmliborder" >&6; }
-# Determine if signalmodule should be used.
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-signal-module" >&5
-$as_echo_n "checking for --with-signal-module... " >&6; }
-
-# Check whether --with-signal-module was given.
-if test "${with_signal_module+set}" = set; then :
- withval=$with_signal_module;
-fi
-
-
-if test -z "$with_signal_module"
-then with_signal_module="yes"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_signal_module" >&5
-$as_echo "$with_signal_module" >&6; }
-
-if test "${with_signal_module}" = "yes"; then
- USE_SIGNAL_MODULE=""
- SIGNAL_OBJS=""
-else
- USE_SIGNAL_MODULE="#"
- SIGNAL_OBJS="Parser/intrcheck.o Python/sigcheck.o"
-fi
-
# This is used to generate Setup.config
USE_THREAD_MODULE=""
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2814,26 +2814,6 @@
fi])
AC_MSG_RESULT($with_dbmliborder)
-# Determine if signalmodule should be used.
-AC_SUBST(USE_SIGNAL_MODULE)
-AC_SUBST(SIGNAL_OBJS)
-AC_MSG_CHECKING(for --with-signal-module)
-AC_ARG_WITH(signal-module,
- AS_HELP_STRING([--with-signal-module], [disable/enable signal module]))
-
-if test -z "$with_signal_module"
-then with_signal_module="yes"
-fi
-AC_MSG_RESULT($with_signal_module)
-
-if test "${with_signal_module}" = "yes"; then
- USE_SIGNAL_MODULE=""
- SIGNAL_OBJS=""
-else
- USE_SIGNAL_MODULE="#"
- SIGNAL_OBJS="Parser/intrcheck.o Python/sigcheck.o"
-fi
-
# This is used to generate Setup.config
AC_SUBST(USE_THREAD_MODULE)
USE_THREAD_MODULE=""
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list