From 57ab41fa019d3ce276decd488938e5a00049cb9d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 7 Mar 2017 22:18:57 +0100 Subject: [PATCH] Make the compilation of .pyc and .pyo conditional This commit adds --{enable,disable}-{pyc,pyo} options to enable/disable the compilation of pyc/pyo files. Signed-off-by: Thomas Petazzoni [Peter: update for 2.7.16] Signed-off-by: Peter Korsgaard --- Makefile.pre.in | 8 ++++++++ configure.ac | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in index 49d3c0926f..247d3c2902 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1139,24 +1139,32 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ $(DESTDIR)$(LIBDEST)/distutils/tests ; \ fi +ifeq (@PYC_BUILD@,yes) PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) +endif +ifeq (@PYO_BUILD@,yes) PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST) -f \ -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ $(DESTDIR)$(LIBDEST) +endif +ifeq (@PYC_BUILD@,yes) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +endif +ifeq (@PYO_BUILD@,yes) -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +endif -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ diff --git a/configure.ac b/configure.ac index 7143172b98..6bd8369105 100644 --- a/configure.ac +++ b/configure.ac @@ -773,6 +773,17 @@ SunOS*) ;; esac +AC_SUBST(PYC_BUILD) + +AC_ARG_ENABLE(pyc-build, + AS_HELP_STRING([--disable-pyc-build], [disable build of pyc files]), + [ PYC_BUILD="${enableval}" ], [ PYC_BUILD=yes ]) + +AC_SUBST(PYO_BUILD) + +AC_ARG_ENABLE(pyo-build, + AS_HELP_STRING([--disable-pyo-build], [disable build of pyo files]), + [ PYO_BUILD="${enableval}" ], [ PYO_BUILD=yes ]) AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) -- 2.11.0