From af4e19f8eeccfd5cefafdeabb6848f51d417c463c9503f0aa1ac4097472feba6 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Tue, 16 Sep 2014 05:55:16 +0000 Subject: [PATCH] Accepting request 249357 from home:arvidjaar:grub2-next add grub2-glibc-2.20.patch - fix build with glibc 2.20+ (use _DEFAULT_SOURCE to avoid warning) OBS-URL: https://build.opensuse.org/request/show/249357 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=113 --- grub2-glibc-2.20.patch | 34 ++++++++++++++++++++++++++++++++++ grub2.changes | 6 ++++++ grub2.spec | 3 +++ 3 files changed, 43 insertions(+) create mode 100644 grub2-glibc-2.20.patch diff --git a/grub2-glibc-2.20.patch b/grub2-glibc-2.20.patch new file mode 100644 index 0000000..cd81e3a --- /dev/null +++ b/grub2-glibc-2.20.patch @@ -0,0 +1,34 @@ +* grub-core/kern/emu/hostfs.c: squahes below warning + warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" + +Signed-off-by: Khem Raj + +Upstream-Status: Submitted +--- + grub-core/kern/emu/hostfs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/grub-core/kern/emu/hostfs.c b/grub-core/kern/emu/hostfs.c +index 7e725f6..823116d 100644 +--- a/grub-core/kern/emu/hostfs.c ++++ b/grub-core/kern/emu/hostfs.c +@@ -19,7 +19,11 @@ + + #include + ++/* Legacy feature macro.*/ + #define _BSD_SOURCE ++/* New feature macro that provides everything _BSD_SOURCE and ++ * _SVID_SOURCE provided and possibly more. */ ++#define _DEFAULT_SOURCE + #include + #include + #include +-- +2.1.0 + + +_______________________________________________ +Grub-devel mailing list +Grub-devel@gnu.org +https://lists.gnu.org/mailman/listinfo/grub-devel diff --git a/grub2.changes b/grub2.changes index 0be78a7..32ef9af 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 15 15:30:03 UTC 2014 - arvidjaar@gmail.com + +- add grub2-glibc-2.20.patch - fix build with glibc 2.20+ + (use _DEFAULT_SOURCE to avoid warning) + ------------------------------------------------------------------- Fri Sep 12 04:14:38 UTC 2014 - mchang@suse.com diff --git a/grub2.spec b/grub2.spec index 313f204..8fdfea2 100644 --- a/grub2.spec +++ b/grub2.spec @@ -156,6 +156,8 @@ Patch102: grub2-btrfs-02-export-subvolume-envvars.patch Patch103: grub2-btrfs-03-follow_default.patch Patch104: grub2-btrfs-04-grub2-install.patch Patch105: grub2-btrfs-05-grub2-mkconfig.patch +# Fix build with glibc 2.20+ +Patch106: grub2-glibc-2.20.patch # PowerPC LE support Patch201: grub2-ppc64le-01-Add-Little-Endian-support-for-Power64-to-the-build.patch Patch202: grub2-ppc64le-02-Build-grub-as-O1-until-we-add-savegpr-and-restgpr-ro.patch @@ -356,6 +358,7 @@ mv po/grub.pot po/%{name}.pot %patch103 -p1 %patch104 -p1 %patch105 -p1 +%patch106 -p1 %patch201 -p1 %patch202 -p1 %patch203 -p1