tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libgcrypt: Allow GRUB to build with Clang

Browse Source 
Attempts to build GRUB with Clang were failing due to errors such as:

  error: redefinition of typedef 'gcry_md_hd_t' is a C11 feature

Correct this by adding a compiler pragma to disable the Clang
"typedef-redefinition" warnings. This required an update to
include/grub/crypto.h and the util/import_gcry.py script to add the
pragma to libgcrypt-grub's types.h due to u16 and similar types.

Signed-off-by: Andrew Hamilton <adhamilt@gmail.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Andrew Hamilton 2025-08-30 22:32:39 -05:00 committed by Daniel Kiper
parent 1d2ee8f8b3
commit 1f9092bfd5
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/grub/crypto.h
View File

@ -245,6 +245,14 @@ typedef struct gcry_md_spec
struct gcry_md_spec *next; struct gcry_md_spec *next;
} gcry_md_spec_t; } gcry_md_spec_t;
/*
* Clang defaults to flagging type redefinitions as warnings.
* A few "forward declarations" in this file are needed due
* to inter-relationship complexities between GRUB and libgcrypt.
*/
#ifdef __clang__
#pragma GCC diagnostic ignored "-Wtypedef-redefinition"
#endif
typedef struct gcry_md_handle*gcry_md_hd_t; typedef struct gcry_md_handle*gcry_md_hd_t;
struct gcry_mpi; struct gcry_mpi;

6
util/import_gcry.py
View File

@ -608,7 +608,11 @@ with codecs.open (os.path.join (cipher_dir_out, "crypto.lst"), "w", "utf-8") as
continue continue
with codecs.open (infile, "r", "utf-8") as f: with codecs.open (infile, "r", "utf-8") as f:
if src == "types.h": if src == "types.h":
fw.write (f.read ().replace ("float f;", "").replace ("double g;", "")) fw.write (f.read ().replace ("float f;", "").replace ("double g;", "") \
.replace("#ifndef HAVE_BYTE",
"#ifdef __clang__\n" \
"#pragma GCC diagnostic ignored \"-Wtypedef-redefinition\"\n#endif\n" \
"#ifndef HAVE_BYTE"))
continue continue
if src == "cipher-proto.h": if src == "cipher-proto.h":