diff mbox

openpgm: needs host python2

Message ID 5e6d3d5d078accc9ba17a52b314cfe8e3badfefa.1396941206.git.baruch@tkos.co.il
State Superseded
Headers show

Commit Message

Baruch Siach April 8, 2014, 7:13 a.m. UTC
When BR2_PACKAGE_PYTHON3=y host python symlinks to python3. This breaks the
version_generator.py script. Make sure we have the right host python version.

Fixes:
http://autobuild.buildroot.net/results/01f/01f886a073439c0639ed93e596b68bcadf1a5824/

Cc: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/openpgm/openpgm.mk | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

Samuel Martin April 8, 2014, 7:29 a.m. UTC | #1
Hi Baruch, all,

On Tue, Apr 8, 2014 at 9:13 AM, Baruch Siach <baruch@tkos.co.il> wrote:
> When BR2_PACKAGE_PYTHON3=y host python symlinks to python3. This breaks the
> version_generator.py script. Make sure we have the right host python version.
>
> Fixes:
> http://autobuild.buildroot.net/results/01f/01f886a073439c0639ed93e596b68bcadf1a5824/
>
> Cc: Samuel Martin <s.martin49@gmail.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/openpgm/openpgm.mk | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/package/openpgm/openpgm.mk b/package/openpgm/openpgm.mk
> index 3ec5c77e28c4..ccfa5909fb00 100644
> --- a/package/openpgm/openpgm.mk
> +++ b/package/openpgm/openpgm.mk
> @@ -15,4 +15,10 @@ OPENPGM_SUBDIR = openpgm/pgm/
>  OPENPGM_CONF_ENV = ac_cv_file__proc_cpuinfo=yes ac_cv_file__dev_rtc=no \
>                     ac_cv_file__dev_hpet=no
>
> +# version_generator.py needs python2
> +ifeq ($(BR2_PACKAGE_PYTHON3),y)
> +OPENPGM_DEPENDENCIES += host-python
> +OPENPGM_CONF_ENV += ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
> +endif
> +

In the pointed build failure log, python is /scratch/peko/host/usr/bin/python.
Do we want to rely on the system python interpreter?
Maybe in such a case we prefer unconditionally relying on python2
built by Buildroot...


>  $(eval $(autotools-package))
> --
> 1.9.1
>

Regards,
Baruch Siach April 8, 2014, 7:45 a.m. UTC | #2
Hi Samuel,

On Tue, Apr 08, 2014 at 09:29:27AM +0200, Samuel Martin wrote:
> On Tue, Apr 8, 2014 at 9:13 AM, Baruch Siach <baruch@tkos.co.il> wrote:
> > When BR2_PACKAGE_PYTHON3=y host python symlinks to python3. This breaks the
> > version_generator.py script. Make sure we have the right host python version.
> >
> > Fixes:
> > http://autobuild.buildroot.net/results/01f/01f886a073439c0639ed93e596b68bcadf1a5824/
> >
> > Cc: Samuel Martin <s.martin49@gmail.com>
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > ---
> >  package/openpgm/openpgm.mk | 6 ++++++
> >  1 file changed, 6 insertions(+)
> >
> > diff --git a/package/openpgm/openpgm.mk b/package/openpgm/openpgm.mk
> > index 3ec5c77e28c4..ccfa5909fb00 100644
> > --- a/package/openpgm/openpgm.mk
> > +++ b/package/openpgm/openpgm.mk
> > @@ -15,4 +15,10 @@ OPENPGM_SUBDIR = openpgm/pgm/
> >  OPENPGM_CONF_ENV = ac_cv_file__proc_cpuinfo=yes ac_cv_file__dev_rtc=no \
> >                     ac_cv_file__dev_hpet=no
> >
> > +# version_generator.py needs python2
> > +ifeq ($(BR2_PACKAGE_PYTHON3),y)
> > +OPENPGM_DEPENDENCIES += host-python
> > +OPENPGM_CONF_ENV += ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
> > +endif
> > +
> 
> In the pointed build failure log, python is /scratch/peko/host/usr/bin/python.
> Do we want to rely on the system python interpreter?

Buildroot already relies on host python as a dependency. We just don't record 
the full path of python, so we can't use it to seed ac_cv_path_PYTHON. Should 
we?

> Maybe in such a case we prefer unconditionally relying on python2
> built by Buildroot...

This makes sense. I'll remove the BR2_PACKAGE_PYTHON3 condition if nobody else 
objects.

baruch

> >  $(eval $(autotools-package))
> > --
> > 1.9.1
diff mbox

Patch

diff --git a/package/openpgm/openpgm.mk b/package/openpgm/openpgm.mk
index 3ec5c77e28c4..ccfa5909fb00 100644
--- a/package/openpgm/openpgm.mk
+++ b/package/openpgm/openpgm.mk
@@ -15,4 +15,10 @@  OPENPGM_SUBDIR = openpgm/pgm/
 OPENPGM_CONF_ENV = ac_cv_file__proc_cpuinfo=yes ac_cv_file__dev_rtc=no \
                    ac_cv_file__dev_hpet=no
 
+# version_generator.py needs python2
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+OPENPGM_DEPENDENCIES += host-python
+OPENPGM_CONF_ENV += ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
+endif
+
 $(eval $(autotools-package))