[Buildroot] [PATCH] package/qpid-proton: needs host-python2
Baruch Siach
baruch at tkos.co.il
Tue Jul 14 11:48:04 UTC 2015
Hi Yann,
On Tue, Jul 14, 2015 at 01:38:14PM +0200, Yann E. MORIN wrote:
> 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.
The manual, under "Mandatory packages", currently lists "python (version 2.6
or 2.7)". Should we change that to "python (version 2.6 or any later)"?
> So, fix the scripts to use '/usr/bin/env python' so it finds it in the
> PATH, and add a dependency to host-python.
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.
baruch
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
> Cc: Baruch Siach <baruch at tkos.co.il>
> ---
> 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
>
> diff --git a/package/qpid-proton/0002-fix-python.patch b/package/qpid-proton/0002-fix-python.patch
> new file mode 100644
> index 0000000..c6f57e8
> --- /dev/null
> +++ b/package/qpid-proton/0002-fix-python.patch
> @@ -0,0 +1,22 @@
> +Those scripts are not pytrhon3-compliant, use python2
> +
> +Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
> +
> +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
> diff --git a/package/qpid-proton/qpid-proton.mk b/package/qpid-proton/qpid-proton.mk
> index eae4589..cb06d97 100644
> --- a/package/qpid-proton/qpid-proton.mk
> +++ b/package/qpid-proton/qpid-proton.mk
> @@ -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 \
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
More information about the buildroot
mailing list