| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091 |
- From 5bbd94f014c89665d02a8a32442822ab7c5520d0 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>
- [aduskett@gmail.com: Update for python 3.6.4]
- Signed-off-by: Adam Duskett <aduskett@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 dc4b92b6fe..3e43066d90 100644
- --- a/Makefile.pre.in
- +++ b/Makefile.pre.in
- @@ -1194,7 +1194,9 @@ bininstall: altbininstall
- -rm -f $(DESTDIR)$(LIBPC)/python3.pc
- (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.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)
- @@ -1239,7 +1241,6 @@ LIBSUBDIRS= site-packages \
- html json http dbm xmlrpc \
- logging csv wsgiref urllib \
- ctypes ctypes/macholib \
- - idlelib idlelib/Icons \
- distutils distutils/command \
- importlib \
- turtledemo \
- @@ -1309,6 +1310,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 1d610e132b..2699e7ceb1 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -3183,6 +3183,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 38aa5e605e..d642825c1e 100644
- --- a/setup.py
- +++ b/setup.py
- @@ -2324,11 +2324,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.13.5
|
