[Buildroot] [PATCH 0/5] Python fixes

[Buildroot] [PATCH 0/5] Python fixes

[Samuel Martin]

Hi all,

Since the host-python2 series [1] got merged, a couple of build failure have
been triggered implying host-python interpreter (I'm too lazy to list the fixes
already merged, check the git log ;-]).

So, to avoid wanting for the autobuilder turning red, here is a series cleaning
and checking most of the packages (all, I hope) depending on host-python wrt:
- for what python is used;
- if python2/python3 can be indifferently used;
- misc. build issues.

Note that the patch [2] (not yet merged) also fixes a similar build failure.

Regards,

Samuel

[1] http://lists.busybox.net/pipermail/buildroot/2014-March/091570.html
[2] http://patchwork.ozlabs.org/patch/338685/


Samuel Martin (5):
  nodejs: use the standard configure/make options
  nodejs: force python interpreter
  omniorb: force python interperter
  host-python-pyrex: use the HOST_*_NEEDS_HOST_PYTHON infrastructure
  openpgm: make its build system python2/python3 friendly

 package/nodejs/nodejs.mk                           | 38 ++++++++++++++++----
 package/omniorb/omniorb.mk                         |  4 +++
 ...on_generator.py-make-it-python3-compliant.patch | 42 ++++++++++++++++++++++
 package/openpgm/openpgm.mk                         |  1 +
 package/python-pyrex/python-pyrex.mk               |  2 +-
 5 files changed, 80 insertions(+), 7 deletions(-)
 create mode 100644 package/openpgm/openpgm-0001-version_generator.py-make-it-python3-compliant.patch

--
1.9.2

[Buildroot] [PATCH 1/5] nodejs: use the standard configure/make options

[Samuel Martin]

Also cleanup leading whitespace.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/nodejs/nodejs.mk | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index a44bfbd..0d84765 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -23,7 +23,10 @@ define HOST_NODEJS_CONFIGURE_CMDS
 	# NPM is non-functional without it, and host-openssl isn't part of
 	# buildroot.
 	(cd $(@D); \
-                ./configure \
+		$(HOST_CONFIGURE_OPTS) \
+		CFLAGS="$(HOST_CFLAGS)" \
+		LDFLAGS="$(HOST_LDFLAGS)" \
+		./configure \
 		--prefix=$(HOST_DIR)/usr \
 		--without-snapshot \
 		--without-dtrace \
@@ -60,6 +63,8 @@ endif
 define NODEJS_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		LD="$(TARGET_CXX)" \
 		./configure \
 		--prefix=/usr \
@@ -75,7 +80,11 @@ define NODEJS_CONFIGURE_CMDS
 endef
 
 define NODEJS_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		LD="$(TARGET_CXX)"
 endef
 
 #
@@ -107,7 +116,12 @@ endef
 endif
 
 define NODEJS_INSTALL_TARGET_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install \
+		DESTDIR=$(TARGET_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		LD="$(TARGET_CXX)"
 	$(NODEJS_INSTALL_MODULES)
 endef
 
-- 
1.9.2

[Buildroot] [PATCH 1/5] nodejs: use the standard configure/make options

[Thomas Petazzoni]

Dear Samuel Martin,

On Mon, 14 Apr 2014 23:05:48 +0200, Samuel Martin wrote:
> Also cleanup leading whitespace.
> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
>  package/nodejs/nodejs.mk | 20 +++++++++++++++++---
>  1 file changed, 17 insertions(+), 3 deletions(-)
> 
> diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
> index a44bfbd..0d84765 100644
> --- a/package/nodejs/nodejs.mk
> +++ b/package/nodejs/nodejs.mk
> @@ -23,7 +23,10 @@ define HOST_NODEJS_CONFIGURE_CMDS
>  	# NPM is non-functional without it, and host-openssl isn't part of
>  	# buildroot.
>  	(cd $(@D); \
> -                ./configure \
> +		$(HOST_CONFIGURE_OPTS) \
> +		CFLAGS="$(HOST_CFLAGS)" \
> +		LDFLAGS="$(HOST_LDFLAGS)" \

HOST_CONFIGURE_OPTS already contain CFLAGS and LDFLAGS definitions that
are identical to the explicit ones you're passing. So why are you
passing explicit CFLAGS and LDFLAGS ?

> +		./configure \
>  		--prefix=$(HOST_DIR)/usr \
>  		--without-snapshot \
>  		--without-dtrace \
> @@ -60,6 +63,8 @@ endif
>  define NODEJS_CONFIGURE_CMDS
>  	(cd $(@D); \
>  		$(TARGET_CONFIGURE_OPTS) \
> +		CFLAGS="$(TARGET_CFLAGS)" \
> +		LDFLAGS="$(TARGET_LDFLAGS)" \

Same question here.

>  		LD="$(TARGET_CXX)" \
>  		./configure \
>  		--prefix=/usr \
> @@ -75,7 +80,11 @@ define NODEJS_CONFIGURE_CMDS
>  endef
>  
>  define NODEJS_BUILD_CMDS
> -	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
> +	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
> +		$(TARGET_CONFIGURE_OPTS) \
> +		CFLAGS="$(TARGET_CFLAGS)" \
> +		LDFLAGS="$(TARGET_LDFLAGS)" \
> +		LD="$(TARGET_CXX)"

Same question here.

>  endef
>  
>  #
> @@ -107,7 +116,12 @@ endef
>  endif
>  
>  define NODEJS_INSTALL_TARGET_CMDS
> -	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install
> +	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install \
> +		DESTDIR=$(TARGET_DIR) \
> +		$(TARGET_CONFIGURE_OPTS) \
> +		CFLAGS="$(TARGET_CFLAGS)" \
> +		LDFLAGS="$(TARGET_LDFLAGS)" \
> +		LD="$(TARGET_CXX)"

And here.

>  	$(NODEJS_INSTALL_MODULES)
>  endef
>  

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

[Buildroot] [PATCH 1/5] nodejs: use the standard configure/make options

[Samuel Martin]

On Mon, Apr 14, 2014 at 11:12 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Samuel Martin,
>
> On Mon, 14 Apr 2014 23:05:48 +0200, Samuel Martin wrote:
>> Also cleanup leading whitespace.
>>
>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> ---
>>  package/nodejs/nodejs.mk | 20 +++++++++++++++++---
>>  1 file changed, 17 insertions(+), 3 deletions(-)
>>
>> diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
>> index a44bfbd..0d84765 100644
>> --- a/package/nodejs/nodejs.mk
>> +++ b/package/nodejs/nodejs.mk
>> @@ -23,7 +23,10 @@ define HOST_NODEJS_CONFIGURE_CMDS
>>       # NPM is non-functional without it, and host-openssl isn't part of
>>       # buildroot.
>>       (cd $(@D); \
>> -                ./configure \
>> +             $(HOST_CONFIGURE_OPTS) \
>> +             CFLAGS="$(HOST_CFLAGS)" \
>> +             LDFLAGS="$(HOST_LDFLAGS)" \
>
> HOST_CONFIGURE_OPTS already contain CFLAGS and LDFLAGS definitions that
> are identical to the explicit ones you're passing. So why are you
> passing explicit CFLAGS and LDFLAGS ?

Right, there redefinitions are useless.
Just get my inspiration from pkg-autotools.mk :-/

>
>> +             ./configure \
>>               --prefix=$(HOST_DIR)/usr \
>>               --without-snapshot \
>>               --without-dtrace \
>> @@ -60,6 +63,8 @@ endif
>>  define NODEJS_CONFIGURE_CMDS
>>       (cd $(@D); \
>>               $(TARGET_CONFIGURE_OPTS) \
>> +             CFLAGS="$(TARGET_CFLAGS)" \
>> +             LDFLAGS="$(TARGET_LDFLAGS)" \
>
> Same question here.

Same answers (+ copy/paste/adapt magics)

>
>>               LD="$(TARGET_CXX)" \
>>               ./configure \
>>               --prefix=/usr \
>> @@ -75,7 +80,11 @@ define NODEJS_CONFIGURE_CMDS
>>  endef
>>
>>  define NODEJS_BUILD_CMDS
>> -     $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
>> +     $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
>> +             $(TARGET_CONFIGURE_OPTS) \
>> +             CFLAGS="$(TARGET_CFLAGS)" \
>> +             LDFLAGS="$(TARGET_LDFLAGS)" \
>> +             LD="$(TARGET_CXX)"
>
> Same question here.

ditto ;)

>
>>  endef
>>
>>  #
>> @@ -107,7 +116,12 @@ endef
>>  endif
>>
>>  define NODEJS_INSTALL_TARGET_CMDS
>> -     $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) DESTDIR=$(TARGET_DIR) install
>> +     $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install \
>> +             DESTDIR=$(TARGET_DIR) \
>> +             $(TARGET_CONFIGURE_OPTS) \
>> +             CFLAGS="$(TARGET_CFLAGS)" \
>> +             LDFLAGS="$(TARGET_LDFLAGS)" \
>> +             LD="$(TARGET_CXX)"
>
> And here.

ditto ;)

>
>>       $(NODEJS_INSTALL_MODULES)
>>  endef
>>
>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com


I'll respin this patch shortly


-- 
Samuel

[Buildroot] [PATCH 2/5] nodejs: force python interpreter

[Samuel Martin]

nodejs build system is based on python, and it does not support python3.

This patch makes sure python2 is used for the build.

Note that, setting PYTHON=... at configure time or in the make
environment is not enough to override all the hard-coded python call, so
we have to sed some python scripts to avoid being screwed.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/nodejs/nodejs.mk | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk
index 0d84765..0b8e285 100644
--- a/package/nodejs/nodejs.mk
+++ b/package/nodejs/nodejs.mk
@@ -17,6 +17,10 @@ ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	NODEJS_DEPENDENCIES += openssl
 endif
 
+# nodejs build system is based on python, but only support python-2.6 or
+# python-2.7. So, we have to enforce PYTHON interpreter to be python2.
+# However, few build scripts hard-code 'python' as the interpreter to be
+# invoked; so we have to manually fix them.
 define HOST_NODEJS_CONFIGURE_CMDS
 	# Build with the static, built-in OpenSSL which is supplied as part of
 	# the nodejs source distribution.  This is needed on the host because
@@ -26,20 +30,23 @@ define HOST_NODEJS_CONFIGURE_CMDS
 		$(HOST_CONFIGURE_OPTS) \
 		CFLAGS="$(HOST_CFLAGS)" \
 		LDFLAGS="$(HOST_LDFLAGS)" \
-		./configure \
+		PYTHON=$(HOST_DIR)/usr/bin/python2 \
+		$(HOST_DIR)/usr/bin/python2 ./configure \
 		--prefix=$(HOST_DIR)/usr \
 		--without-snapshot \
 		--without-dtrace \
 		--without-etw \
 	)
+	$(SED) "s@'python',@'$(HOST_DIR)/usr/bin/python2',@" \
+		$(@D)/deps/v8/tools/gyp/v8.gyp
 endef
 
 define HOST_NODEJS_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+	$(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 $(MAKE) -C $(@D)
 endef
 
 define HOST_NODEJS_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 $(MAKE) -C $(@D) install
 endef
 
 ifeq ($(BR2_i386),y)
@@ -66,7 +73,8 @@ define NODEJS_CONFIGURE_CMDS
 		CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
 		LD="$(TARGET_CXX)" \
-		./configure \
+		PYTHON=$(HOST_DIR)/usr/bin/python2 \
+		$(HOST_DIR)/usr/bin/python2 ./configure \
 		--prefix=/usr \
 		--without-snapshot \
 		$(if $(BR2_PACKAGE_OPENSSL),--shared-openssl,--without-ssl) \
@@ -77,10 +85,13 @@ define NODEJS_CONFIGURE_CMDS
 		$(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \
 		--dest-os=linux \
 	)
+	$(SED) "s@'python',@'$(HOST_DIR)/usr/bin/python2',@" \
+		$(@D)/deps/v8/tools/gyp/v8.gyp
 endef
 
 define NODEJS_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+	$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 \
+		$(MAKE) -C $(@D) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
@@ -116,7 +127,8 @@ endef
 endif
 
 define NODEJS_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install \
+	$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 \
+		$(MAKE) -C $(@D) install \
 		DESTDIR=$(TARGET_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
-- 
1.9.2

[Buildroot] [PATCH 3/5] omniorb: force python interperter

[Samuel Martin]

Omniorb build-system requires python2 interpreter.

By default, it looks for python program, which may fallback on the system
python interpreter in case python is disabled and python3 is enabled.

So, this patch enforces the python interpreter to python2 built by
Buildroot.

Fixes:
  http://autobuild.buildroot.org/results/b4f/b4f3a2602ba0224ac3253c4bf6ed87ec045df772/

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/omniorb/omniorb.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/omniorb/omniorb.mk b/package/omniorb/omniorb.mk
index fa2492f..5b58da5 100644
--- a/package/omniorb/omniorb.mk
+++ b/package/omniorb/omniorb.mk
@@ -14,6 +14,10 @@ OMNIORB_DEPENDENCIES = host-omniorb
 HOST_OMNIORB_DEPENDENCIES = host-python
 OMNIORB_INSTALL_TARGET = YES
 
+# omniorb is not python3 friendly, so force the python interpreter
+OMNIORB_CONF_OPT = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
+HOST_OMNIORB_CONF_OPT = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
+
 # Defaulting long double support to a safe option for the
 # mix of embedded targets, this could later be automated
 # based on checking the capability of the cross toolchain
-- 
1.9.2

[Buildroot] [PATCH 3/5] omniorb: force python interperter

[Thomas Petazzoni]

Dear Samuel Martin,

On Mon, 14 Apr 2014 23:05:50 +0200, Samuel Martin wrote:
> Omniorb build-system requires python2 interpreter.
> 
> By default, it looks for python program, which may fallback on the system
> python interpreter in case python is disabled and python3 is enabled.
> 
> So, this patch enforces the python interpreter to python2 built by
> Buildroot.
> 
> Fixes:
>   http://autobuild.buildroot.org/results/b4f/b4f3a2602ba0224ac3253c4bf6ed87ec045df772/
> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
>  package/omniorb/omniorb.mk | 4 ++++
>  1 file changed, 4 insertions(+)

Applied, thanks.

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

[Buildroot] [PATCH 4/5] host-python-pyrex: use the HOST_*_NEEDS_HOST_PYTHON infrastructure

[Samuel Martin]

This will automatically take care of adding the right host-python package
to the dependency list and it will avoid trying to build python-pyrex using
python3.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
 package/python-pyrex/python-pyrex.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/python-pyrex/python-pyrex.mk b/package/python-pyrex/python-pyrex.mk
index 73cb163..7f424ad 100644
--- a/package/python-pyrex/python-pyrex.mk
+++ b/package/python-pyrex/python-pyrex.mk
@@ -7,9 +7,9 @@
 PYTHON_PYREX_VERSION = 0.9.9
 PYTHON_PYREX_SOURCE = Pyrex-$(PYTHON_PYREX_VERSION).tar.gz
 PYTHON_PYREX_SITE = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
-PYTHON_PYREX_DEPENDENCIES = host-python
 PYTHON_PYREX_LICENSE = Apache-v2
 PYTHON_PYREX_LICENSE_FILES = LICENSE.txt
 PYTHON_PYREX_SETUP_TYPE = distutils
+HOST_PYTHON_PYREX_NEEDS_HOST_PYTHON = python2
 
 $(eval $(host-python-package))
-- 
1.9.2

[Buildroot] [PATCH 4/5] host-python-pyrex: use the HOST_*_NEEDS_HOST_PYTHON infrastructure

[Thomas Petazzoni]

Dear Samuel Martin,

On Mon, 14 Apr 2014 23:05:51 +0200, Samuel Martin wrote:
> This will automatically take care of adding the right host-python package
> to the dependency list and it will avoid trying to build python-pyrex using
> python3.
> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> ---
>  package/python-pyrex/python-pyrex.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Did you actually verify the python-pyrex only works with Python 2 ?
Your commit log doesn't even say that.

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

[Buildroot] [PATCH 4/5] host-python-pyrex: use the HOST_*_NEEDS_HOST_PYTHON infrastructure

[Samuel Martin]

On Mon, Apr 14, 2014 at 11:15 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Samuel Martin,
>
> On Mon, 14 Apr 2014 23:05:51 +0200, Samuel Martin wrote:
>> This will automatically take care of adding the right host-python package
>> to the dependency list and it will avoid trying to build python-pyrex using
>> python3.
>>
>> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
>> ---
>>  package/python-pyrex/python-pyrex.mk | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Did you actually verify the python-pyrex only works with Python 2 ?
> Your commit log doesn't even say that.

Yes, I did check it.
Sorry for missing this in the commit log :s
Do you mind add it when you'll apply the patch or should I repost it?

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



-- 
Samuel

[Buildroot] [PATCH 4/5] host-python-pyrex: use the HOST_*_NEEDS_HOST_PYTHON infrastructure

[Thomas Petazzoni]

Dear Samuel Martin,

On Mon, 14 Apr 2014 23:22:55 +0200, Samuel Martin wrote:

> Yes, I did check it.
> Sorry for missing this in the commit log :s
> Do you mind add it when you'll apply the patch or should I repost it?

Since you're going to resend for patches 1 and 2, you can also fix that
patch 4 and resend it :-)

Thanks!

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

[Buildroot] [PATCH 5/5] openpgm: make its build system python2/python3 friendly

[Samuel Martin]

This patch fixes build issue when python3 is enabled, and host python2
interpreter is not available.

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

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Cc: Baruch Siach <baruch@tkos.co.il>

---

Note that, though current openpgm trunk (svn+1508) supports python2 and
python3, I have not backported the upstream patch because
version_generator.py has been touched by several non-atomic change sets.
---
 ...on_generator.py-make-it-python3-compliant.patch | 42 ++++++++++++++++++++++
 package/openpgm/openpgm.mk                         |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 package/openpgm/openpgm-0001-version_generator.py-make-it-python3-compliant.patch

diff --git a/package/openpgm/openpgm-0001-version_generator.py-make-it-python3-compliant.patch b/package/openpgm/openpgm-0001-version_generator.py-make-it-python3-compliant.patch
new file mode 100644
index 0000000..97cff29
--- /dev/null
+++ b/package/openpgm/openpgm-0001-version_generator.py-make-it-python3-compliant.patch
@@ -0,0 +1,42 @@
+From e04f5c20fc1536f8e6d4faf32f2f4657d441f7c8 Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Mon, 14 Apr 2014 17:54:37 +0200
+Subject: [PATCH] version_generator.py: make it python3 compliant
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ openpgm/pgm/version_generator.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/openpgm/pgm/version_generator.py b/openpgm/pgm/version_generator.py
+index 2265480..c31376f 100755
+--- a/openpgm/pgm/version_generator.py
++++ b/openpgm/pgm/version_generator.py
+@@ -1,5 +1,7 @@
+ #!/usr/bin/python
+ 
++from __future__ import print_function
++
+ import os
+ import platform
+ import time
+@@ -8,7 +10,7 @@ build_date = time.strftime ("%Y-%m-%d")
+ build_time = time.strftime ("%H:%M:%S")
+ build_rev = filter (str.isdigit, "$Revision: 1369 $")
+ 
+-print """
++print("""
+ /* vim:ts=8:sts=8:sw=4:noai:noexpandtab
+  * 
+  * OpenPGM version.
+@@ -47,6 +49,6 @@ const char* pgm_build_revision = "%s";
+ 
+ 
+ /* eof */
+-"""%(build_date, build_time, platform.system(), platform.machine(), build_rev)
++"""%(build_date, build_time, platform.system(), platform.machine(), build_rev))
+ 
+ # end of file
+-- 
+1.9.2
+
diff --git a/package/openpgm/openpgm.mk b/package/openpgm/openpgm.mk
index 3ec5c77..951effb 100644
--- a/package/openpgm/openpgm.mk
+++ b/package/openpgm/openpgm.mk
@@ -12,6 +12,7 @@ OPENPGM_LICENSE_FILES = openpgm/pgm/LICENSE
 OPENPGM_INSTALL_STAGING = YES
 OPENPGM_AUTORECONF = YES
 OPENPGM_SUBDIR = openpgm/pgm/
+OPENPGM_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python)
 OPENPGM_CONF_ENV = ac_cv_file__proc_cpuinfo=yes ac_cv_file__dev_rtc=no \
                    ac_cv_file__dev_hpet=no
 
-- 
1.9.2

[Buildroot] [PATCH 5/5] openpgm: make its build system python2/python3 friendly

[Thomas Petazzoni]

Dear Samuel Martin,

On Mon, 14 Apr 2014 23:05:52 +0200, Samuel Martin wrote:
> This patch fixes build issue when python3 is enabled, and host python2
> interpreter is not available.
> 
> Fixes:
>   http://autobuild.buildroot.net/results/01f/01f886a073439c0639ed93e596b68bcadf1a5824/
> 
> Signed-off-by: Samuel Martin <s.martin49@gmail.com>
> Cc: Baruch Siach <baruch@tkos.co.il>

Applied, thanks.

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