Skip to contentSkip to conversation

package/qpid-proton: needs host-python2

PATCH New Yann E. MORIN 2 participants 2 messages Jul 14, 2015

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

Cc Baruch Siach <[email protected]>
Cc Samuel Martin <[email protected]>

---
Changes v1 -> v2:
- really use our python2 (Baruch)
- no longer patch, it's not used (Baruch)

---
 package/qpid-proton/qpid-proton.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
package/qpid-proton/qpid-proton.mk +4 -1
index eae4589..12fddb4 100644
@@ -11,12 +11,15 @@ 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 \
-	-DENABLE_WARNING_ERROR=OFF
+	-DENABLE_WARNING_ERROR=OFF \
+	-DPYTHON_EXECUTABLE=$(HOST_DIR)/usr/bin/python2
 
 define QPID_PROTON_REMOVE_USELESS_FILES
 	rm -fr $(TARGET_DIR)/usr/share/proton-*/
Signature · 1 line
1.9.1
#1 lore raw

PATCH v2 1/1 package/qpid-proton: needs host-python2

Dear Yann E. MORIN,

Quoted 6 lines · Yann E. MORIN

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.

This commit log no longer matched the implementation. So I fixed that up and applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com