Re: [PATCH v4 0/4] Update gnulib and drop some patches

[Glenn Washburn]

On Wed,  2 Feb 2022 14:33:29 -0500
Robbie Harwood <rharwood@redhat.com> wrote:

> Changes in this version:
> 
> - Address fix several warnings Glenn pointed out.  Note that gnulib isn't
>   clean with our default cflags - they prefer different ones.  (I had
>   previously missed these because of how much stuff I turn off to build with
>   our old gnulib copy.)

Can you explain a bit the cflags issue? I'm not following.

This update is failing to build at a couple of places. I'm not sure if
this is new with the subsequent gnulib update or if this was there in
the previous series, but didn't get triggered. Here's the error
messages I'm seeing. Could these be because I should be using some
cflags that I'm not?

In file included from /home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/
gnulib/base64.c:48:
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/gnulib/ialloc.h: In fu
nction ‘ireallocarray’:
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/gnulib/ialloc.h:92:13:
 error: implicit declaration of function ‘reallocarray’; did you mean 
‘ireallocarray’? [-Werror=implicit-function-declaration]
   92 |           ? reallocarray (p, n, s)
      |             ^~~~~~~~~~~~
      |             ireallocarray
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/gnulib/ialloc.h:92:13:
 error: nested extern declaration of ‘reallocarray’ [-Werror=nested-externs]
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/gnulib/ialloc.h:93:11:
 error: pointer/integer type mismatch in conditional expression [-Werror]
   93 |           : _gl_alloc_nomem ());
      |           ^

and another...

/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/gnulib/base64.c: At to
p level:
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/gnulib/ialloc.h:81:10:
 error: ‘calloc’ is static but used in inline function ‘icalloc’ which is not 
static [-Werror]
   81 |   return calloc (n, s);
      |          ^~~~~~
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/gnulib/ialloc.h:61:26:
 error: ‘realloc’ is static but used in inline function ‘irealloc’ which is not 
static [-Werror]
   61 |   return s <= SIZE_MAX ? realloc (p, s | !s) : _gl_alloc_nomem ();
      |                          ^~~~~~~
+ REAL_SHELL=/usr/bin/bash
/home/g10/grub-tests-uml-update-gnulib/grub/grub-core/lib/gnulib/ialloc.h:51:26:
 error: ‘malloc’ is static but used in inline function ‘imalloc’ which is not 
static [-Werror]
   51 |   return s <= SIZE_MAX ? malloc (s) : _gl_alloc_nomem ();
      |                          ^~~~~~

Glenn

> 
> - Update gnulib target version again while we're here
> 
> Be well,
> --Robbie
> 
> Robbie Harwood (4):
>   Use visual indentation in config.h.in
>   Drop gnulib fix-base64.patch
>   Drop gnulib no-abort.patch
>   Update gnulib version and drop most gnulib patches
> 
>  bootstrap                                     | 319 ++++++++++--------
>  bootstrap.conf                                |  18 +-
>  conf/Makefile.extra-dist                      |   8 -
>  config.h.in                                   |  76 +++--
>  configure.ac                                  |   2 +-
>  grub-core/Makefile.core.def                   |   1 +
>  grub-core/disk/luks2.c                        |   4 +-
>  grub-core/lib/gnulib-patches/fix-base64.patch |  21 --
>  .../lib/gnulib-patches/fix-null-deref.patch   |  13 -
>  .../gnulib-patches/fix-null-state-deref.patch |  12 -
>  .../fix-regcomp-uninit-token.patch            |  15 -
>  .../fix-regexec-null-deref.patch              |  12 -
>  .../gnulib-patches/fix-uninit-structure.patch |  11 -
>  .../lib/gnulib-patches/fix-unused-value.patch |  14 -
>  grub-core/lib/gnulib-patches/no-abort.patch   |  26 --
>  grub-core/lib/posix_wrap/limits.h             |   6 +-
>  grub-core/lib/posix_wrap/sys/types.h          |   7 +-
>  grub-core/lib/xzembed/xz.h                    |   5 +-
>  include/grub/compiler.h                       |   4 +-
>  include/grub/list.h                           |   2 +-
>  20 files changed, 256 insertions(+), 320 deletions(-)
>  delete mode 100644 grub-core/lib/gnulib-patches/fix-base64.patch
>  delete mode 100644 grub-core/lib/gnulib-patches/fix-null-deref.patch
>  delete mode 100644 grub-core/lib/gnulib-patches/fix-null-state-deref.patch
>  delete mode 100644 
> grub-core/lib/gnulib-patches/fix-regcomp-uninit-token.patch
>  delete mode 100644 grub-core/lib/gnulib-patches/fix-regexec-null-deref.patch
>  delete mode 100644 grub-core/lib/gnulib-patches/fix-uninit-structure.patch
>  delete mode 100644 grub-core/lib/gnulib-patches/fix-unused-value.patch
>  delete mode 100644 grub-core/lib/gnulib-patches/no-abort.patch
>