[Buildroot] [PATCH 0/2] package/norm: prepare for Python3

[Buildroot] [PATCH 0/2] package/norm: prepare for Python3

[Titouan Christophe]

This small series update the norm package to make it possible to compile it
using a Python3 based waf package infrastructure, and changes the download
server to Github to enhance the reliability of the tarball download, because
the original server is quite slow and unreliable.

Titouan Christophe (2):
  package/norm: switch to Github hosted archive
  package/norm: make wscript Python3 compatible

 ...ction-call-for-Python3-compatibility.patch | 29 +++++++++++++
 ...ixed-tabs-spaces-in-protolib-wscript.patch | 41 +++++++++++++++++++
 package/norm/norm.hash                        |  2 +-
 package/norm/norm.mk                          |  4 +-
 4 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch
 create mode 100644 package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch

-- 
2.24.1

[Buildroot] [PATCH 1/2] package/norm: switch to Github hosted archive

[Titouan Christophe]

The original download server (downloads.pf.itd.nrl.navy.mil)
is quite unreliable, which lead to the download being very slow
or even failing. Since the project is now hosted on Github, we
switch to that site, which makes the download tractable.

Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
---
 package/norm/norm.hash | 2 +-
 package/norm/norm.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/norm/norm.hash b/package/norm/norm.hash
index b4fd8e171a..2eddb91ecb 100644
--- a/package/norm/norm.hash
+++ b/package/norm/norm.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	4480a6ea53fb7ce45b4bc2061d18fbfd46ee9990fc2ed9a9dc303ce4d87888a6	src-norm-1.5.8.tgz
+sha256	4480a6ea53fb7ce45b4bc2061d18fbfd46ee9990fc2ed9a9dc303ce4d87888a6	src-norm-with-protolib-1.5.8.tgz
 sha256	ba4b7e49b0163d6839830e3f47505696c6eaac77ccd93531831dc837b2160608	LICENSE.TXT
diff --git a/package/norm/norm.mk b/package/norm/norm.mk
index d5f7d0400b..2f9fc7b657 100644
--- a/package/norm/norm.mk
+++ b/package/norm/norm.mk
@@ -5,8 +5,8 @@
 ################################################################################
 
 NORM_VERSION = 1.5.8
-NORM_SITE = http://downloads.pf.itd.nrl.navy.mil/norm
-NORM_SOURCE = src-norm-$(NORM_VERSION).tgz
+NORM_SITE = https://github.com/USNavalResearchLaboratory/norm/releases/download/v$(NORM_VERSION)
+NORM_SOURCE = src-norm-with-protolib-$(NORM_VERSION).tgz
 NORM_INSTALL_STAGING = YES
 NORM_LICENSE = NRL License
 NORM_LICENSE_FILES = LICENSE.TXT
-- 
2.24.1

[Buildroot] [PATCH 2/2] package/norm: make wscript Python3 compatible

[Titouan Christophe]

This makes slight modifications to the waf build definition files
that make possible to compile norm with Waf running on Python3.

This has been tested on my experimental Python3 waf-package
infrastructure, and still works with the actual Py2 setup.

Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
---
 ...ction-call-for-Python3-compatibility.patch | 29 +++++++++++++
 ...ixed-tabs-spaces-in-protolib-wscript.patch | 41 +++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch
 create mode 100644 package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch

diff --git a/package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch b/package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch
new file mode 100644
index 0000000000..945a9df48c
--- /dev/null
+++ b/package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch
@@ -0,0 +1,29 @@
+From 8c02c2cbc6f07ddaef23e6bf2f6b9a269ed85ff4 Mon Sep 17 00:00:00 2001
+From: Titouan Christophe <titouan.christophe@railnova.eu>
+Date: Tue, 4 Feb 2020 11:59:07 +0100
+Subject: [PATCH] Use print as function call for Python3 compatibility
+
+A similar patch has already been applied upstream, in commit
+ada15125a1cbb3b1718d6eef78512a36ed327fcc, which will therefore be
+available in the next norm release
+
+Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
+---
+ wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index 8428899..0fdae96 100644
+--- a/wscript
++++ b/wscript
+@@ -32,7 +32,7 @@ for line in vfile.readlines():
+     if "#define" == line[0] and "VERSION" == line[1]:
+         VERSION = line[2].strip('"')
+ if VERSION is None:
+-    print "Warning: NORM VERSION not found!?"
++    print("Warning: NORM VERSION not found!?")
+ 
+ # So you don't need to do ./waf configure if you are just using the defaults
+ waflib.Configure.autoconfig = True
+-- 
+2.24.1
diff --git a/package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch b/package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch
new file mode 100644
index 0000000000..e99f292d22
--- /dev/null
+++ b/package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch
@@ -0,0 +1,41 @@
+From 0ff75628845d3c86974c31b50ecd60c0b0144c6d Mon Sep 17 00:00:00 2001
+From: Titouan Christophe <titouan.christophe@railnova.eu>
+Date: Tue, 4 Feb 2020 13:44:27 +0100
+Subject: [PATCH] Fix mixed tabs/spaces in protolib wscript
+
+This fixes the following error when using waf in Python3:
+    TabError: inconsistent use of tabs and spaces in indentation
+
+The upstream file has since diverged, but with similar issues.
+[Upstream status: https://github.com/USNavalResearchLaboratory/protolib/pull/6]
+
+Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
+---
+ protolib/wscript | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/protolib/wscript b/protolib/wscript
+index 155a660..97dda93 100644
+--- a/protolib/wscript
++++ b/protolib/wscript
+@@ -120,7 +120,7 @@ def configure(ctx):
+     # Compiler-specific flags
+     if ctx.options.debug:
+         #ctx.env.DEFINES_BUILD_PROTOLIB += ['PROTO_DEBUG', 'DEBUG', '_DEBUG']
+-		ctx.env.DEFINES_BUILD_PROTOLIB += ['PROTO_DEBUG', 'DEBUG']
++        ctx.env.DEFINES_BUILD_PROTOLIB += ['PROTO_DEBUG', 'DEBUG']
+     else:
+         ctx.env.DEFINES_BUILD_PROTOLIB += ['NDEBUG', "PROTO_DEBUG"]
+ 
+@@ -139,7 +139,7 @@ def configure(ctx):
+             ctx.env.CFLAGS += ['/Od', '/RTC1', '/ZI']
+         else:
+             ctx.env.CXXFLAGS += ['/Ox', '/DNDEBUG']
+-        	#ctx.env.CXXFLAGS += ['/Ox', '/DNDEBUG', '/DWINVER=0x0501']
++            #ctx.env.CXXFLAGS += ['/Ox', '/DNDEBUG', '/DWINVER=0x0501']
+         ctx.env.CFLAGS
+ 
+ def build(ctx):
+-- 
+2.24.1
+
-- 
2.24.1

[Buildroot] [PATCH 0/2] package/norm: prepare for Python3

[Yann E. MORIN]

Titouan, All,

On 2020-02-04 14:31 +0100, Titouan Christophe spake thusly:
> This small series update the norm package to make it possible to compile it
> using a Python3 based waf package infrastructure, and changes the download
> server to Github to enhance the reliability of the tarball download, because
> the original server is quite slow and unreliable.
> 
> Titouan Christophe (2):
>   package/norm: switch to Github hosted archive
>   package/norm: make wscript Python3 compatible

Series applied to master, thanks.

I just re-aligned the hash fields with the new spacing convention.

Thanks!

Regards,
Yann E. MORIN.

>  ...ction-call-for-Python3-compatibility.patch | 29 +++++++++++++
>  ...ixed-tabs-spaces-in-protolib-wscript.patch | 41 +++++++++++++++++++
>  package/norm/norm.hash                        |  2 +-
>  package/norm/norm.mk                          |  4 +-
>  4 files changed, 73 insertions(+), 3 deletions(-)
>  create mode 100644 package/norm/0002-Use-print-as-function-call-for-Python3-compatibility.patch
>  create mode 100644 package/norm/0003-Fix-mixed-tabs-spaces-in-protolib-wscript.patch
> 
> -- 
> 2.24.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'