Re: [PATCH 2/2] gnulib: Fix build of base64 when compiling with memory debugging

[Patrick Steinhardt]

On Mon, Mar 09, 2020 at 12:19:15PM +0100, Daniel Kiper wrote:
> On Sat, Mar 07, 2020 at 05:29:09PM +0100, Patrick Steinhardt wrote:
> > When building GRUB with memory management debugging enabled, then the
> > build fails because of `grub_debug_malloc()` and `grub_debug_free()`
> > being undefined in the luks2 module. The cause is that we patch
> > "base64.h" to unconditionaly include "config-util.h", which shouldn't be
> > included for modules at all. As a result, `MM_DEBUG` is defined when
> > building the module, causing it to use the debug memory allocation
> > functions. As these are not built into modules, we end up with a linker
> > error.
> >
> > Fix the issue by removing the <config-util.h> include altogether. The
> > sole reason it was included was for the `_GL_ATTRIBUTE_CONST` macro,
> > which we can simply define as empty in case it's not set.
> >
> > Signed-off-by: Patrick Steinhardt <address@hidden>
> > ---
> >  grub-core/lib/gnulib-patches/fix-base64.patch | 14 ++++++--------
> >  1 file changed, 6 insertions(+), 8 deletions(-)
> >
> > diff --git a/grub-core/lib/gnulib-patches/fix-base64.patch 
> > b/grub-core/lib/gnulib-patches/fix-base64.patch
> > index e075b6fab..985db1279 100644
> > --- a/grub-core/lib/gnulib-patches/fix-base64.patch
> > +++ b/grub-core/lib/gnulib-patches/fix-base64.patch
> > @@ -1,14 +1,8 @@
> >  diff --git a/lib/base64.h b/lib/base64.h
> > -index 9cd0183b8..a2aaa2d4a 100644
> > +index 9cd0183b8..185a2afa1 100644
> >  --- a/lib/base64.h
> >  +++ b/lib/base64.h
> > -@@ -18,11 +18,16 @@
> > - #ifndef BASE64_H
> > - # define BASE64_H
> 
> Hmmm... It seems to me that you should not drop this...

Note that this is a diff of a patch. So all that's getting dropped is
the patch that added the #include. So after applying this, "base64.h"
doesn't get touched by fix-base64.patch at all anymore.

Patrick

signature.asc
Description: PGP signature