58fe9aa736
- Clean up the build a bit to make it faster - Make grubenv work right on UEFI machines Related: rhbz#1119943 - Sort debug and rescue kernels later than normal ones Related: rhbz#1065360 - Allow "fallback" to include entries by title as well as number. Related: rhbz#1026084 - Fix a segfault on aarch64. - Load arm with SB enabled if available. - Add some serial port options to GRUB_MODULES. Signed-off-by: Peter Jones <pjones@redhat.com>
43 lines
1.1 KiB
Diff
43 lines
1.1 KiB
Diff
From 767cf43a2e5c738df50155cc8729ad0f57d6ab47 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Mon, 3 Feb 2014 14:34:27 +0100
|
|
Subject: [PATCH 056/152] * util/grub-mkfont.c: Build fix for argp.h
|
|
with older gcc.
|
|
|
|
---
|
|
ChangeLog | 4 ++++
|
|
util/grub-mkfont.c | 4 ++++
|
|
2 files changed, 8 insertions(+)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 1a822f3..f2bba84 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,3 +1,7 @@
|
|
+2014-02-03 Vladimir Serbinenko <phcoder@gmail.com>
|
|
+
|
|
+ * util/grub-mkfont.c: Build fix for argp.h with older gcc.
|
|
+
|
|
2014-01-29 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
|
* grub-core/disk/ahci.c: Increase timeout. Some SSDs take up to
|
|
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
|
|
index 3de07ee..e6485b4 100644
|
|
--- a/util/grub-mkfont.c
|
|
+++ b/util/grub-mkfont.c
|
|
@@ -33,7 +33,11 @@
|
|
|
|
#ifndef GRUB_BUILD
|
|
#define _GNU_SOURCE 1
|
|
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
|
|
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
|
|
#include <argp.h>
|
|
+#pragma GCC diagnostic error "-Wmissing-prototypes"
|
|
+#pragma GCC diagnostic error "-Wmissing-declarations"
|
|
#endif
|
|
#include <assert.h>
|
|
|
|
--
|
|
1.9.3
|
|
|