[Crosstoolchain-logs] [device-tree-compiler] 54/57: pylibfdt: Use Python2 explicitly

Vagrant Cascadian vagrant at moszumanska.debian.org
Thu Sep 28 22:04:01 UTC 2017


This is an automated email from the git hooks/post-receive script.

vagrant pushed a commit to branch upstream/latest
in repository device-tree-compiler.

commit 8c1eb1526d2d02f34bfe6f94dacba60834ae9f79
Author: David Gibson <david at gibson.dropbear.id.au>
Date:   Wed Sep 27 18:10:02 2017 +1000

    pylibfdt: Use Python2 explicitly
    
    The pylibfdt code is written for Python2, not Python3.  So, it's safer to
    explicitly request Python2 in our scripts and when checking pkg-config.
    
    On Arch Linux at least, there isn't actually a plain "python" link, just
    "python2" and "python3", so the current setup won't work at all.
    
    According to https://www.python.org/dev/peps/pep-0394/ using "python2"
    should work, and is preferred.
    
    Updating pylibfdt to work with Python3 would be nice, but is a problem for
    another day.
    
    Signed-off-by: David Gibson <david at gibson.dropbear.id.au>
---
 Makefile          | 2 +-
 pylibfdt/setup.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index fe482b9..782a085 100644
--- a/Makefile
+++ b/Makefile
@@ -129,7 +129,7 @@ all: $(BIN) libfdt
 # We need both Python and swig to build pylibfdt.
 .PHONY: maybe_pylibfdt
 maybe_pylibfdt: FORCE
-	if $(PKG_CONFIG) --cflags python >/dev/null 2>&1; then \
+	if $(PKG_CONFIG) --cflags python2 >/dev/null 2>&1; then \
 		if which swig >/dev/null 2>&1; then \
 			can_build=yes; \
 		fi; \
diff --git a/pylibfdt/setup.py b/pylibfdt/setup.py
index 90e80f3..1a1e832 100755
--- a/pylibfdt/setup.py
+++ b/pylibfdt/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 
 """
 setup.py file for SWIG libfdt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/crosstoolchain/device-tree-compiler.git



More information about the Crosstoolchain-logs mailing list