| From f1b15834045d0641c43014b970721df066fa71f7 Mon Sep 17 00:00:00 2001 |
| From: Maxime Ripard <maxime.ripard@free-electrons.com> |
| Date: Wed, 22 Feb 2017 17:45:14 -0800 |
| Subject: [PATCH] Add an option to disable IDLE |
| |
| IDLE is an IDE embedded into python, written using Tk, so it doesn't make |
| much sense to have it into our build. |
| |
| Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> |
| [ Andrey Smirnov: ported to Python 3.6 ] |
| Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> |
| --- |
| Makefile.pre.in | 7 ++++++- |
| configure.ac | 6 ++++++ |
| setup.py | 4 +++- |
| 3 files changed, 15 insertions(+), 2 deletions(-) |
| |
| diff --git a/Makefile.pre.in b/Makefile.pre.in |
| index e678c8817e..1148bd8708 100644 |
| --- a/Makefile.pre.in |
| +++ b/Makefile.pre.in |
| @@ -1355,7 +1355,9 @@ bininstall: altbininstall |
| -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc |
| (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) |
| -rm -f $(DESTDIR)$(BINDIR)/idle3 |
| +ifeq (@IDLE@,yes) |
| (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) |
| +endif |
| -rm -f $(DESTDIR)$(BINDIR)/pydoc3 |
| ifeq (@PYDOC@,yes) |
| (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) |
| @@ -1398,7 +1400,6 @@ LIBSUBDIRS= site-packages \ |
| html json http dbm xmlrpc \ |
| logging csv wsgiref urllib \ |
| ctypes ctypes/macholib \ |
| - idlelib idlelib/Icons \ |
| distutils distutils/command \ |
| importlib \ |
| turtledemo \ |
| @@ -1492,6 +1493,10 @@ ifeq (@EXPAT@,yes) |
| LIBSUBDIRS += $(XMLLIBSUBDIRS) |
| endif |
| |
| +ifeq (@IDLE@,yes) |
| +LIBSUBDIRS += idlelib idlelib/Icons |
| +endif |
| + |
| ifeq (@LIB2TO3@,yes) |
| LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 |
| TESTSUBDIRS += lib2to3/tests \ |
| diff --git a/configure.ac b/configure.ac |
| index 5844e3b73f..7bd4623ccd 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -3400,6 +3400,12 @@ AC_ARG_ENABLE(lib2to3, |
| AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), |
| [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) |
| |
| +AC_SUBST(IDLE) |
| + |
| +AC_ARG_ENABLE(idle3, |
| + AS_HELP_STRING([--disable-idle3], [disable idle3 IDE]), |
| + [ IDLE="${enableval}" ], [ IDLE=yes ]) |
| + |
| # Check for enable-ipv6 |
| AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) |
| AC_MSG_CHECKING([if --enable-ipv6 is specified]) |
| diff --git a/setup.py b/setup.py |
| index 211a160f29..c4ee989ba3 100644 |
| --- a/setup.py |
| +++ b/setup.py |
| @@ -2587,11 +2587,13 @@ def main(): |
| import warnings |
| warnings.filterwarnings("ignore",category=DeprecationWarning) |
| |
| - scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] |
| + scripts = [ 'Lib/smtpd.py'] |
| if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): |
| scripts += [ 'Tools/scripts/pydoc3' ] |
| if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): |
| scripts += [ 'Tools/scripts/2to3' ] |
| + if not '--disable-idle3' in sysconfig.get_config_var("CONFIG_ARGS"): |
| + scripts += [ 'Tools/scripts/idle3' ] |
| |
| setup(# PyPI Metadata (PEP 301) |
| name = "Python", |
| -- |
| 2.25.1 |
| |
