Ensure the install process is PEP-394 compliant.

Submitted by Raghavendra Prabhu on Nov. 29, 2016, 12:07 a.m.

Details

Message ID CAEtq3tMeE2VRqa84ciLJivPh_84A_p8Q+k5LL08BS3wO76Bb5w@mail.gmail.com
State Superseded
Series "Ensure the install process is PEP-394 compliant."
Headers show

Commit Message

Raghavendra Prabhu Nov. 29, 2016, 12:07 a.m.
The installation needs to use python2, but it uses python in the
Makefile which fails later with syntax error
(since it is written for python2).

As per PEP-394 - https://www.python.org/dev/peps/pep-0394/ -,
'all distributions should ensure that python refers to the same target
as python2 .', hence this change.

Therefore, python2 is used by default in lib/Makefile, though
this can be overriden with PYTHON_BIN.

Tested with:

a) PYTHON_BIN=python2 make install
b) make install

c) export PYTHON_BIN=python2
   make test

Signed-off-by: Raghavendra Prabhu <me at rdprabhu dot com>
---
 lib/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


 uninstall:

Patch hide | download patch | download mbox

diff --git a/lib/Makefile b/lib/Makefile
index 65ba93c..5fc7648 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,6 +2,7 @@  include $(__nmk_dir)include.mk

 CRIU_SO := libcriu.so
 UAPI_HEADERS := c/criu.h ../images/rpc.proto
+PYTHON_BIN ?= python2

 #
 # File to keep track of files installed by setup.py
@@ -55,7 +56,7 @@  install: lib-c lib-py ../crit/crit c/criu.pc.in
  $(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e
's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir
$(INCLUDEDIR)/criu/),' c/criu.pc.in > c/criu.pc
  $(Q) install -m 644 c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
  $(E) "  INSTALL " crit
- $(Q) python ../scripts/crit-setup.py install --root=$(DESTDIR)
--prefix=$(PREFIX) --record $(CRIT_SETUP_FILES)
+ $(Q) $(PYTHON_BIN) ../scripts/crit-setup.py install
--root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES)
 .PHONY: install

Comments

Pavel Emelianov Nov. 30, 2016, 8:54 a.m.
Applied, thanks