diff mbox

package/ncurses: fix build on noMMU uclinux targets

Message ID 1471786682-18906-1-git-send-email-yann.morin.1998@free.fr
State Accepted
Headers show

Commit Message

Yann E. MORIN Aug. 21, 2016, 1:38 p.m. UTC
The ncurses buildsystem does not recognise 'uclinux' as being a 'linux',
so it falls back to generic checks, especially when trying to decide
what macros to define. So it misses defining absolutely required macros
when doing widechar, which break the bui,d.

But 'uclinux' is just a 'linux' like any other in this respect.

We fix both aclocal.m4 and the generated ./configure script because
ncurses does not autoreconf correctly (see comment in 0001-*.patch).

Fixes:
    http://autobuild.buildroot.org/?reason=ncurses-5.9
    http://autobuild.buildroot.org/results/d5c/d5c787d34acbfc0c0c7bd8cc0e15b5bc2460d88a/
    http://autobuild.buildroot.org/results/fc4/fc4b41fb955c390913a879e0202760347ce29987/
    [...too many to list...]

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Waldemar Brodkorb <wbx@openadk.org>
---
 package/ncurses/0003-recognise-uclinux.patch | 30 ++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/ncurses/0003-recognise-uclinux.patch

Comments

Baruch Siach Aug. 21, 2016, 3:16 p.m. UTC | #1
Hi Yann,

On Sun, Aug 21, 2016 at 03:38:02PM +0200, Yann E. MORIN wrote:
> The ncurses buildsystem does not recognise 'uclinux' as being a 'linux',
> so it falls back to generic checks, especially when trying to decide
> what macros to define. So it misses defining absolutely required macros
> when doing widechar, which break the bui,d.
> 
> But 'uclinux' is just a 'linux' like any other in this respect.
> 
> We fix both aclocal.m4 and the generated ./configure script because
> ncurses does not autoreconf correctly (see comment in 0001-*.patch).
> 
> Fixes:
>     http://autobuild.buildroot.org/?reason=ncurses-5.9

The failures shown in this link might change over time, so I'm not sure it is 
good for a commit log message.

>     http://autobuild.buildroot.org/results/d5c/d5c787d34acbfc0c0c7bd8cc0e15b5bc2460d88a/
>     http://autobuild.buildroot.org/results/fc4/fc4b41fb955c390913a879e0202760347ce29987/

These, on the other hand, are immutable.

baruch
Yann E. MORIN Aug. 21, 2016, 4:37 p.m. UTC | #2
Baruch, All,

On 2016-08-21 18:16 +0300, Baruch Siach spake thusly:
> On Sun, Aug 21, 2016 at 03:38:02PM +0200, Yann E. MORIN wrote:
> > The ncurses buildsystem does not recognise 'uclinux' as being a 'linux',
> > so it falls back to generic checks, especially when trying to decide
> > what macros to define. So it misses defining absolutely required macros
> > when doing widechar, which break the bui,d.
> > 
> > But 'uclinux' is just a 'linux' like any other in this respect.
> > 
> > We fix both aclocal.m4 and the generated ./configure script because
> > ncurses does not autoreconf correctly (see comment in 0001-*.patch).
> > 
> > Fixes:
> >     http://autobuild.buildroot.org/?reason=ncurses-5.9
> 
> The failures shown in this link might change over time, so I'm not sure it is 
> good for a commit log message.

Well, even if the results it will return in the future will not
necessarily be the same of it does today, looking only to the results
that occured before that patch is applied would still be interesting.

(But there's nothing in the autobuild website to limit on date...)

Regards,
Yann E. MORIN.

> >     http://autobuild.buildroot.org/results/d5c/d5c787d34acbfc0c0c7bd8cc0e15b5bc2460d88a/
> >     http://autobuild.buildroot.org/results/fc4/fc4b41fb955c390913a879e0202760347ce29987/
> 
> These, on the other hand, are immutable.
> 
> baruch
> 
> -- 
>      http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
> =}------------------------------------------------ooO--U--Ooo------------{=
>    - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
Thomas Petazzoni Aug. 21, 2016, 8:21 p.m. UTC | #3
Hello,

On Sun, 21 Aug 2016 15:38:02 +0200, Yann E. MORIN wrote:
> The ncurses buildsystem does not recognise 'uclinux' as being a 'linux',
> so it falls back to generic checks, especially when trying to decide
> what macros to define. So it misses defining absolutely required macros
> when doing widechar, which break the bui,d.
> 
> But 'uclinux' is just a 'linux' like any other in this respect.
> 
> We fix both aclocal.m4 and the generated ./configure script because
> ncurses does not autoreconf correctly (see comment in 0001-*.patch).
> 
> Fixes:
>     http://autobuild.buildroot.org/?reason=ncurses-5.9

I do agree with Baruch, this link is not really appropriate, so I
dropped it.

>     http://autobuild.buildroot.org/results/d5c/d5c787d34acbfc0c0c7bd8cc0e15b5bc2460d88a/
>     http://autobuild.buildroot.org/results/fc4/fc4b41fb955c390913a879e0202760347ce29987/
>     [...too many to list...]
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Waldemar Brodkorb <wbx@openadk.org>
> ---
>  package/ncurses/0003-recognise-uclinux.patch | 30 ++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
>  create mode 100644 package/ncurses/0003-recognise-uclinux.patch

Applied to master, thanks for the additional investigation!

Thomas
Thomas Petazzoni Aug. 21, 2016, 8:22 p.m. UTC | #4
Hello,

On Sun, 21 Aug 2016 15:38:02 +0200, Yann E. MORIN wrote:
> The ncurses buildsystem does not recognise 'uclinux' as being a 'linux',
> so it falls back to generic checks, especially when trying to decide
> what macros to define. So it misses defining absolutely required macros
> when doing widechar, which break the bui,d.
> 
> But 'uclinux' is just a 'linux' like any other in this respect.
> 
> We fix both aclocal.m4 and the generated ./configure script because
> ncurses does not autoreconf correctly (see comment in 0001-*.patch).
> 
> Fixes:
>     http://autobuild.buildroot.org/?reason=ncurses-5.9
>     http://autobuild.buildroot.org/results/d5c/d5c787d34acbfc0c0c7bd8cc0e15b5bc2460d88a/
>     http://autobuild.buildroot.org/results/fc4/fc4b41fb955c390913a879e0202760347ce29987/
>     [...too many to list...]
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Waldemar Brodkorb <wbx@openadk.org>
> ---
>  package/ncurses/0003-recognise-uclinux.patch | 30 ++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
>  create mode 100644 package/ncurses/0003-recognise-uclinux.patch

Oh, and BTW, please submit the patch upstream. Thanks!

Thomas
diff mbox

Patch

diff --git a/package/ncurses/0003-recognise-uclinux.patch b/package/ncurses/0003-recognise-uclinux.patch
new file mode 100644
index 0000000..e86546c
--- /dev/null
+++ b/package/ncurses/0003-recognise-uclinux.patch
@@ -0,0 +1,30 @@ 
+aclocal: fix detection for uclinux hosts
+
+uclinux is just a linux like the others...
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN ncurses-5.9.orig/aclocal.m4 ncurses-5.9/aclocal.m4
+--- ncurses-5.9.orig/aclocal.m4	2011-04-01 01:35:38.000000000 +0200
++++ ncurses-5.9/aclocal.m4	2016-08-21 15:24:47.003620029 +0200
+@@ -6531,7 +6531,7 @@
+ irix[[56]].*) #(vi
+ 	cf_xopen_source="-D_SGI_SOURCE"
+ 	;;
+-linux*|gnu*|mint*|k*bsd*-gnu) #(vi
++linux*|uclinux*|gnu*|mint*|k*bsd*-gnu) #(vi
+ 	CF_GNU_SOURCE
+ 	;;
+ mirbsd*) #(vi
+diff -durN ncurses-5.9.orig/configure ncurses-5.9/configure
+--- ncurses-5.9.orig/configure	2016-08-21 15:21:50.789285661 +0200
++++ ncurses-5.9/configure	2016-08-21 15:24:35.187463625 +0200
+@@ -6984,7 +6984,7 @@
+ irix[56].*) #(vi
+ 	cf_xopen_source="-D_SGI_SOURCE"
+ 	;;
+-linux*|gnu*|mint*|k*bsd*-gnu) #(vi
++linux*|uclinux*|gnu*|mint*|k*bsd*-gnu) #(vi
+ 
+ echo "$as_me:6996: checking if we must define _GNU_SOURCE" >&5
+ echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6