diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-02-28 14:30:23 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-02-28 14:30:23 +0100 |
| commit | b108fdcb83d457e5d43298fb93dbfd805d076f24 (patch) | |
| tree | 7fbd64a13fc915f5cea93708419cb3c6aa1b40ea /package/python/python-101-optional-pydoc.patch | |
| parent | a6cfaea44e5105cb66e4e797042f64335f5e7c01 (diff) | |
| parent | 9e40a1005f51d10784db295797ed270a130d79d5 (diff) | |
| download | buildroot-b108fdcb83d457e5d43298fb93dbfd805d076f24.tar.gz buildroot-b108fdcb83d457e5d43298fb93dbfd805d076f24.zip | |
Merge branch 'next'
Conflicts:
Makefile
package/dmraid/Config.in
package/gdb/Config.in.host
package/linux-headers/linux-headers.mk
package/python/python.mk
package/python3/python3.mk
package/rt-tests/Config.in
package/sdl/sdl.mk
package/systemd/systemd-01-fix-getty-unit.patch
package/systemd/systemd-02-fix-page-size.patch
package/systemd/systemd-03-uclibc-fix.patch
package/udev/Config.in
package/udisks/Config.in
package/vlc/vlc.mk
system/Config.in
Quite some merge conflicts, hopefully I didn't screw up anything.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/python/python-101-optional-pydoc.patch')
| -rw-r--r-- | package/python/python-101-optional-pydoc.patch | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/package/python/python-101-optional-pydoc.patch b/package/python/python-101-optional-pydoc.patch new file mode 100644 index 0000000000..c9b05bd76a --- /dev/null +++ b/package/python/python-101-optional-pydoc.patch @@ -0,0 +1,82 @@ +Add an option to disable pydoc + +It removes 0.5 MB of data from the target plus the pydoc script +itself. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Signed-off-by: Samuel Martin <s.martin49@gmail.com> + +--- + Makefile.pre.in | 6 +++++- + configure.in | 5 +++++ + setup.py | 10 +++++++--- + 3 files changed, 17 insertions(+), 4 deletions(-) + +Index: b/Makefile.pre.in +=================================================================== +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -947,7 +947,7 @@ + multiprocessing multiprocessing/dummy \ + unittest \ + lib-old \ +- curses pydoc_data $(MACHDEPS) ++ curses $(MACHDEPS) + + TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ + lib-tk/test/test_ttk \ +@@ -968,6 +968,10 @@ + LIBSUBDIRS += $(TESTSUBDIRS) + endif + ++ifeq (@PYDOC@,yes) ++LIBSUBDIRS += pydoc_data ++endif ++ + libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ + do \ +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -2613,6 +2613,11 @@ + AC_CHECK_FUNCS(pthread_atfork) + fi + ++AC_SUBST(PYDOC) ++ ++AC_ARG_ENABLE(pydoc, ++ AS_HELP_STRING([--disable-pydoc], [disable pydoc]), ++ [ PYDOC="${enableval}" ], [ PYDOC=yes ]) + + AC_SUBST(TEST_MODULES) + +Index: b/setup.py +=================================================================== +--- a/setup.py ++++ b/setup.py +@@ -2205,6 +2205,12 @@ + # turn off warnings when deprecated modules are imported + import warnings + warnings.filterwarnings("ignore",category=DeprecationWarning) ++ ++ scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3', ++ 'Lib/smtpd.py'] ++ if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): ++ scripts += [ 'Tools/scripts/pydoc' ] ++ + setup(# PyPI Metadata (PEP 301) + name = "Python", + version = sys.version.split()[0], +@@ -2225,9 +2231,7 @@ + ext_modules=[Extension('_struct', ['_struct.c'])], + + # Scripts to install +- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', +- 'Tools/scripts/2to3', +- 'Lib/smtpd.py'] ++ scripts = scripts, + ) + + # --install-platlib |
