vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix Mingw W64-32 cross compile failure due to printf redefinition in libintl.h

Browse source 
In file included from util/misc.c:36:0:
./include/grub/emu/misc.h:56:1: error: 'libintl_printf' is an unrecognized format function type [-Werror=format=]
 char * EXPORT_FUNC(xasprintf) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) WARN_UNUSED_RESULT;
 ^
./include/grub/emu/misc.h:58:1: error: 'libintl_printf' is an unrecognized format function type [-Werror=format=]

The reason is libintl.h which redefines printf as libintl_printf. The problem
is not present in native MinGW build which avoids redefinition.  Use
(format (__printf__) instead which is valid replacement in GCC.

v2: add grub-core/lib/libgcrypt/src/g10lib.h
v3: modify g10lib.h during import
This commit is contained in:
Andrey Borzenkov 2014-01-25 21:49:41 +04:00
parent 1440b7ebae
commit 5ae584c0b0
5 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/import_gcry.py
View file

@ -534,6 +534,12 @@ for src in sorted (os.listdir (os.path.join (indir, "src"))):
fw.close ()
continue
if src == "g10lib.h":
fw.write (f.read ().replace ("(printf,f,a)", "(__printf__,f,a)"))
f.close ()
fw.close ()
continue
fw.write (f.read ())
f.close ()
fw.close ()