1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283 |
- From ffa7fbceb54918eb518474c8f821fda0a58cf181 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>
- [ Adam Duskett: ported to Python 3.10.0 ]
- Signed-off-by: Adam Duskett <aduskett@gmail.com>
- [ Adam Duskett: ported to Python 3.12.1 ]
- Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
- ---
- Makefile.pre.in | 9 ++++++++-
- configure.ac | 6 ++++++
- 2 files changed, 14 insertions(+), 1 deletion(-)
- diff --git a/Makefile.pre.in b/Makefile.pre.in
- index 3f314d1354..5fad7f82fb 100644
- --- a/Makefile.pre.in
- +++ b/Makefile.pre.in
- @@ -2048,7 +2048,9 @@ bininstall: commoninstall 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)
- @@ -2100,7 +2102,6 @@ LIBSUBDIRS= asyncio \
- ensurepip ensurepip/_bundled \
- html \
- http \
- - idlelib idlelib/Icons \
- importlib importlib/resources importlib/metadata \
- json \
- logging \
- @@ -2267,6 +2268,10 @@ TESTSUBDIRS += test/test_lib2to3 \
- test/test_lib2to3/data/fixers/myfixes
- endif
-
- +ifeq (@IDLE@,yes)
- +LIBSUBDIRS += idlelib idlelib/Icons
- +endif
- +
- TEST_MODULES=@TEST_MODULES@
-
- .PHONY: libinstall
- @@ -2484,7 +2489,9 @@ libainstall: all scripts
- ifeq (@LIB2TO3@,yes)
- $(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION)
- endif
- +ifeq (@IDLE@,yes)
- $(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION)
- +endif
- ifeq (@PYDOC@,yes)
- $(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION)
- endif
- diff --git a/configure.ac b/configure.ac
- index f0354c580d..43086962e9 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -7567,6 +7567,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 ])
- +
- # generate output files
- AC_CONFIG_FILES(m4_normalize([
- Makefile.pre
- --
- 2.34.1
|