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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2014-01-25 Andrey Borzenkov <arvidjaar@gmail.com>
* include/grub/crypto.h: Replace __attribute__ ((format (printf)) with
__attribute__ ((format (__printf__)) to fix compilation under MinGW-w64.
* include/grub/emu/misc.h: ... and here.
* include/grub/err.h: ... and here.
* util/import_gcry.py: ... and here (in files g10lib.h).
2014-01-25 Andrey Borzenkov <arvidjaar@gmail.com> 2014-01-25 Andrey Borzenkov <arvidjaar@gmail.com>
* util/grub-mkimage.c: Make prefix argument mandatory. * util/grub-mkimage.c: Make prefix argument mandatory.

2
include/grub/crypto.h
View file

@ -408,7 +408,7 @@ void _gcry_assert_failed (const char *expr, const char *file, int line,
const char *func) __attribute__ ((noreturn)); const char *func) __attribute__ ((noreturn));
void _gcry_burn_stack (int bytes); void _gcry_burn_stack (int bytes);
void _gcry_log_error( const char *fmt, ... ) __attribute__ ((format (printf, 1, 2))); void _gcry_log_error( const char *fmt, ... ) __attribute__ ((format (__printf__, 1, 2)));
#ifdef GRUB_UTIL #ifdef GRUB_UTIL

8
include/grub/emu/misc.h
View file

@ -53,11 +53,11 @@ grub_util_device_is_mapped (const char *dev);
void * EXPORT_FUNC(xmalloc) (grub_size_t size) WARN_UNUSED_RESULT; void * EXPORT_FUNC(xmalloc) (grub_size_t size) WARN_UNUSED_RESULT;
void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) WARN_UNUSED_RESULT; void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) WARN_UNUSED_RESULT;
char * EXPORT_FUNC(xstrdup) (const char *str) WARN_UNUSED_RESULT; char * EXPORT_FUNC(xstrdup) (const char *str) WARN_UNUSED_RESULT;
char * EXPORT_FUNC(xasprintf) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))) WARN_UNUSED_RESULT; char * EXPORT_FUNC(xasprintf) (const char *fmt, ...) __attribute__ ((format (__printf__, 1, 2))) WARN_UNUSED_RESULT;
void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); void EXPORT_FUNC(grub_util_warn) (const char *fmt, ...) __attribute__ ((format (__printf__, 1, 2)));
void EXPORT_FUNC(grub_util_info) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2))); void EXPORT_FUNC(grub_util_info) (const char *fmt, ...) __attribute__ ((format (__printf__, 1, 2)));
void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((format (printf, 1, 2), noreturn)); void EXPORT_FUNC(grub_util_error) (const char *fmt, ...) __attribute__ ((format (__printf__, 1, 2), noreturn));
grub_uint64_t EXPORT_FUNC (grub_util_get_cpu_time_ms) (void); grub_uint64_t EXPORT_FUNC (grub_util_get_cpu_time_ms) (void);

2
include/grub/err.h
View file

@ -91,6 +91,6 @@ int EXPORT_FUNC(grub_error_pop) (void);
void EXPORT_FUNC(grub_print_error) (void); void EXPORT_FUNC(grub_print_error) (void);
extern int EXPORT_VAR(grub_err_printed_errors); extern int EXPORT_VAR(grub_err_printed_errors);
int grub_err_printf (const char *fmt, ...) int grub_err_printf (const char *fmt, ...)
__attribute__ ((format (printf, 1, 2))); __attribute__ ((format (__printf__, 1, 2)));
#endif /* ! GRUB_ERR_HEADER */ #endif /* ! GRUB_ERR_HEADER */

6
util/import_gcry.py
View file

@ -534,6 +534,12 @@ for src in sorted (os.listdir (os.path.join (indir, "src"))):
fw.close () fw.close ()
continue 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 ()) fw.write (f.read ())
f.close () f.close ()
fw.close () fw.close ()