package/qpid-proton: needs host-python2

qpid-proton is using constructs that are not valid in python3. qpid-proton is hardcoding calls to /usr/bin/python, which can be whatever version.

So, fix the scripts to use '/usr/bin/env python' so it finds it in the PATH, and add a dependency to host-python.

Signed-off-by "Yann E. MORIN" <[email protected]>

Cc Baruch Siach <[email protected]>

---
 package/qpid-proton/0002-fix-python.patch | 22 ++++++++++++++++++++++
 package/qpid-proton/qpid-proton.mk        |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 package/qpid-proton/0002-fix-python.patch

package/qpid-proton/0002-fix-python.patch new file +22 -0

new file mode 100644
index 0000000..c6f57e8
@@ -0,0 +1,22 @@
+Those scripts are not pytrhon3-compliant, use python2
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+
+diff -durN qpid-proton-0.9.1.orig/proton-c/src/codec/encodings.h.py qpid-proton-0.9.1/proton-c/src/codec/encodings.h.py
+--- qpid-proton-0.9.1.orig/proton-c/src/codec/encodings.h.py	2015-04-29 21:17:49.000000000 +0200
++++ qpid-proton-0.9.1/proton-c/src/codec/encodings.h.py	2015-07-14 13:20:40.798356160 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python2
+ #
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements.  See the NOTICE file
+diff -durN qpid-proton-0.9.1.orig/proton-c/src/protocol.h.py qpid-proton-0.9.1/proton-c/src/protocol.h.py
+--- qpid-proton-0.9.1.orig/proton-c/src/protocol.h.py	2015-04-29 21:17:49.000000000 +0200
++++ qpid-proton-0.9.1/proton-c/src/protocol.h.py	2015-07-14 13:21:19.750824925 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python2
+ #
+ # Licensed to the Apache Software Foundation (ASF) under one
+ # or more contributor license agreements.  See the NOTICE file

package/qpid-proton/qpid-proton.mk +2 -0

index eae4589..cb06d97 100644
@@ -11,8 +11,10 @@ QPID_PROTON_LICENSE = Apache-2.0
 QPID_PROTON_LICENSE_FILES = LICENSE
 QPID_PROTON_INSTALL_STAGING = YES
 QPID_PROTON_DEPENDENCIES = \
+	host-python \
 	util-linux \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl)
+
 QPID_PROTON_CONF_OPTS = \
 	-DBUILD_JAVA=OFF \
 	-DENABLE_VALGRIND=OFF \

My interpretation of the cmake log is that cmake uses the python interpreter it detects to run the scripts. In the failed cases cmake detected host-python3 because host-python3 happened to build before qpid-proton. cmake did not use the distro installed host python even though it's python2 (most likely). So I'm not sure patching the scripts is necessary.

Quoted 6 lines · Baruch Siach

My interpretation of the cmake log is that cmake uses the python interpreter it detects to run the scripts. In the failed cases cmake detected host-python3 because host-python3 happened to build before qpid-proton. cmake did not use the distro installed host python even though it's python2 (most likely). So I'm not sure patching the scripts is necessary.

It is necessary if your host machine has a Python 3 interpreter and not a Python 2 interpreter. In this case the scripts will
run /usr/bin/python (because it's hardcoded in their source code), and this will run Python 3.

So Yann's solution looks good. Am I missing something?

Quoted 13 lines · Baruch Siach

Quoted 6 lines

My interpretation of the cmake log is that cmake uses the python interpreter it detects to run the scripts. In the failed cases cmake detected host-python3 because host-python3 happened to build before qpid-proton. cmake did not use the distro installed host python even though it's python2 (most likely). So I'm not sure patching the scripts is necessary.

It is necessary if your host machine has a Python 3 interpreter and not a Python 2 interpreter. In this case the scripts will
run /usr/bin/python (because it's hardcoded in their source code), and this will run Python 3.

Quoted 1 line

So Yann's solution looks good. Am I missing something?

My point is that in the failed cases /usr/bin/python was not used, otherwise the build would have succeeded. It seems that cmake uses the python interpreter it detects to run the scripts. So patching the scripts doesn't change anything by itself, IIUC.

Quoted 13 lines · Baruch Siach

Quoted 6 lines

My interpretation of the cmake log is that cmake uses the python interpreter it detects to run the scripts. In the failed cases cmake detected host-python3 because host-python3 happened to build before qpid-proton. cmake did not use the distro installed host python even though it's python2 (most likely). So I'm not sure patching the scripts is necessary.

It is necessary if your host machine has a Python 3 interpreter and not a Python 2 interpreter. In this case the scripts will
run /usr/bin/python (because it's hardcoded in their source code), and this will run Python 3.

Quoted 1 line

So Yann's solution looks good. Am I missing something?

My point is that in the failed cases /usr/bin/python was not used, otherwise the build would have succeeded. It seems that cmake uses the python interpreter it detects to run the scripts. So patching the scripts doesn't change anything by itself, IIUC.

Related to this, what do you thing about changing the host python requirement in the manual?