From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1jBH6k-00030y-Ur for mharc-grub-devel@gnu.org; Mon, 09 Mar 2020 08:02:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54075) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBH6f-0002zt-JP for grub-devel@gnu.org; Mon, 09 Mar 2020 08:02:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBH6d-0005oF-UW for grub-devel@gnu.org; Mon, 09 Mar 2020 08:02:01 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:54613) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jBH6d-0005nQ-Fy for grub-devel@gnu.org; Mon, 09 Mar 2020 08:01:59 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id B14CB43E; Mon, 9 Mar 2020 08:01:56 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 09 Mar 2020 08:01:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=date :from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=iNpuGJntO8//YOrHtuDKdZb36KB I3FckBNBsJ7ouLkU=; b=EuTm9ZFbUDEFO2OGBfGt3Um7fF8W5lZ53GCnEYvuYB+ 2KxLwclKKlyEPGgZZFngW5bnFysZBaBtti60vqZaDuxxyAeTk8Y3godKbNG68+JS LJ/k44gOdGl6nEalnxH+suUDZ1/jN2MpwGyRClcyGB8NY3KFZE9pdGPKlxn5OKGL Z3A8McZBloegctghc+QDBi/flaIPaq922EYMM8zAOdR0gADBAdfGLbF9bwcQlbvK 0paWCTIy86cWioh/zLnMOZnWIDvZnTgrVS6vNO8Y9gwtViWJAeMFFTNEDDJ2R+8i NY/F+VcWMfMXDKaWWtbLyWgKPzPHon/1ZgcPBBzVW/g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=iNpuGJ ntO8//YOrHtuDKdZb36KBI3FckBNBsJ7ouLkU=; b=I5EC7w6euHo1rB27a/9tCw y7uNam7GHipRxlASF7sqGbe+r2OSJZtK7o6869YW8IhfKiqthsDZPGnpXoA1VRjP JAU2ditpTOf96ACNlJmQZQVS6lLOEt4OXZiXnweQ4y3q20IoTemaE5EPuk4WlvB3 EYPCv6eXqVcVz6gt6+hGy75XPhDKWSnvp5zUU+2zIbWprdWl+bz+D1gTf/z8QdWG qDX7032RBb0diX1GJFNL069olCza04WaePI5DC04khBdXJ7n9pp3l8Mg01Iqinav upVH3jJ8UKCsMNl7mHNC8D62Lfjd6nZme0jb1TAX4jRT7prWJAemfarbEMp52KbQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedugedruddukedgfeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvffukfhfgggtuggjsehgtderredttddvnecuhfhrohhmpefrrghtrhhi tghkucfuthgvihhnhhgrrhguthcuoehpshesphhkshdrihhmqeenucfkphepjeejrdduke efrddvvdefrdduudegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghi lhhfrhhomhepphhssehpkhhsrdhimh X-ME-Proxy: Received: from vm-mail (x4db7df72.dyn.telefonica.de [77.183.223.114]) by mail.messagingengine.com (Postfix) with ESMTPA id C74D9328005D; Mon, 9 Mar 2020 08:01:54 -0400 (EDT) Received: from localhost (ncase [10.192.0.11]) by vm-mail (OpenSMTPD) with ESMTPSA id bf39bca5 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 9 Mar 2020 12:01:51 +0000 (UTC) Date: Mon, 9 Mar 2020 13:01:51 +0100 From: Patrick Steinhardt To: Daniel Kiper Cc: grub-devel@gnu.org, Olaf Hering , Paul Menzel Subject: Re: [PATCH 2/2] gnulib: Fix build of base64 when compiling with memory debugging Message-ID: <20200309120151.GA40682@ncase> References: <20200309111915.bdcyhrynnst37vdz@tomti.i.net-space.pl> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Qxx1br4bt0+wmkIi" Content-Disposition: inline In-Reply-To: <20200309111915.bdcyhrynnst37vdz@tomti.i.net-space.pl> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 64.147.123.21 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2020 12:02:05 -0000 --Qxx1br4bt0+wmkIi Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 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 > > --- > > 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 >=20 > 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 --Qxx1br4bt0+wmkIi Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEtmscHsieVjl9VyNUEXxntp6r8SwFAl5mMC4ACgkQEXxntp6r 8Sy92RAAsknRFW/WiQ+Ft12p3R7Kk0GgG6rm4IDQOeM/ktTajNo6MMr3OkF6TVbe 3WFRXd85DtLcONGUVUmOAVjOoYuRKiQZqJw6q5VKInOhOyiKaLYo5uf7hzp4ElW0 PUtdIBrwwYZLYn4CcP79p5OX5gXiRNwQ0/Ep+Lqpf+2s0T8SEQt0xeitamH5T4W2 ttlIgiELbl2DngNq6JVc5ikPN9bNjAtZgwtWL+TS8TZH/OgUswlUQE6EDxWUbOoa rOl8YkCGez5ve2UF9w/urz59t1P77RFfNwyb0bobXwZQwkWNClRm52/biBrZzMMT md9pP7Lc+5qclG8z0rT0q910uRN/h8gJ21W2yWl7bDgTtNf+jf/hGdtHcvYMvDzb +GxMASBjG2RYLudCf+divZVMHbLTB+xvWuBOPsTmuH4uun4f7g2haF9+GFDpKMou KPEuz0DwhDeG+YgJFZxH0/mccEhHH0IO80FSenpPY6P4jWcOF0O0zyDIU6XJcOP5 D16ds8w9sQxW25JiN9HZsz4xTNtRdgjF2/Fd3w/3cHuGdjirzmsvtGlcuS418Hnv kQsh026rcd6HNUfBq5r9zOlB2/TWkdAYz7yTyaAE0BWHHaRg8pbVLkUhgPXnAfD4 kURiOIiYQ4THl0kMzypPMPTIghXpzQODlTS8FKG5xR6Z6SFS7HA= =e70Y -----END PGP SIGNATURE----- --Qxx1br4bt0+wmkIi--