git: ec74116ace52 - main - dialog: finish update to 1.3-20210117

[Baptiste Daroussin]

On Mon, Mar 01, 2021 at 02:50:28PM +0000, Alexander Richardson wrote:
> On Fri, 26 Feb 2021 at 09:17, Baptiste Daroussin <bapt at freebsd.org> wrote:
> >
> > The branch main has been updated by bapt:
> >
> > URL: https://cgit.FreeBSD.org/src/commit/?id=ec74116ace52591cf121623e2010ae5efab5524a
> >
> > commit ec74116ace52591cf121623e2010ae5efab5524a
> > Author:     Baptiste Daroussin <bapt at FreeBSD.org>
> > AuthorDate: 2021-02-26 09:13:13 +0000
> > Commit:     Baptiste Daroussin <bapt at FreeBSD.org>
> > CommitDate: 2021-02-26 09:17:19 +0000
> >
> >     dialog: finish update to 1.3-20210117
> >
> >     patch dialog.c which requires stddef for the usage of offsetof
> >     catchup on the config header
> > ---
> >  contrib/dialog/dialog.c        |  1 +
> >  gnu/lib/libdialog/Makefile     |  2 +-
> >  gnu/lib/libdialog/dlg_config.h | 15 ++++++++++++---
> >  3 files changed, 14 insertions(+), 4 deletions(-)
> >
> > diff --git a/contrib/dialog/dialog.c b/contrib/dialog/dialog.c
> > index 510baeb97add..f59c9dc03c13 100644
> > --- a/contrib/dialog/dialog.c
> > +++ b/contrib/dialog/dialog.c
> > @@ -26,6 +26,7 @@
> >
> >  #include <dialog.h>
> >
> > +#include <stddef.h>
> >  #include <string.h>
> >  #include <sys/types.h>
> >  #include <sys/stat.h>
> > diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
> > index e4f1b62121d9..8c6b84b64f90 100644
> > --- a/gnu/lib/libdialog/Makefile
> > +++ b/gnu/lib/libdialog/Makefile
> > @@ -15,7 +15,7 @@ MAN=          dialog.3
> >
> >  LIBADD=                ncursesw m
> >
> > -CFLAGS+=       -I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -DGCC_UNUSED=__unused
> > +CFLAGS+=       -I${.CURDIR} -I${DIALOG} -D_XOPEN_SOURCE_EXTENDED -Wno-macro-redefined
> 
> This appears to have broken the GCC build:
> cc1: error: unrecognized command line option '-Wno-macro-redefined' [-Werror]
> Probably fixable by using CFLAGS.clang?
> 
> Thanks,
> Alex
> 

I have fixed the warning instead.

Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/dev-commits-src-main/attachments/20210301/0c3e1c7f/attachment.sig>