diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-30 09:28:10 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-30 09:28:10 +0100 |
| commit | 1acfbca7dfc7beff7f5988d7e3621c930b7eaccd (patch) | |
| tree | fb48de66fa0e6a017dcf0218577e1bdffd2eb576 /pkgs/tools/misc/grub | |
| parent | 41c0302661b90dd98e9c1806e5e747ea339d5a3d (diff) | |
| download | nixlib-1acfbca7dfc7beff7f5988d7e3621c930b7eaccd.tar nixlib-1acfbca7dfc7beff7f5988d7e3621c930b7eaccd.tar.gz nixlib-1acfbca7dfc7beff7f5988d7e3621c930b7eaccd.tar.bz2 nixlib-1acfbca7dfc7beff7f5988d7e3621c930b7eaccd.tar.lz nixlib-1acfbca7dfc7beff7f5988d7e3621c930b7eaccd.tar.xz nixlib-1acfbca7dfc7beff7f5988d7e3621c930b7eaccd.tar.zst nixlib-1acfbca7dfc7beff7f5988d7e3621c930b7eaccd.zip | |
grub2: Fix building against Glibc 2.20
http://hydra.nixos.org/build/16563301
Diffstat (limited to 'pkgs/tools/misc/grub')
| -rw-r--r-- | pkgs/tools/misc/grub/2.0x.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/misc/grub/glibc-2.20.patch | 29 |
2 files changed, 30 insertions, 1 deletions
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index e5471a6c404c..1dbdfff7448d 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" ''; - patches = [ ./fix-bash-completion.patch ]; + patches = [ ./fix-bash-completion.patch ./glibc-2.20.patch ]; configureFlags = optional zfsSupport "--enable-libzfs" ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystems.${stdenv.system}.target}" "--program-prefix=" ]; diff --git a/pkgs/tools/misc/grub/glibc-2.20.patch b/pkgs/tools/misc/grub/glibc-2.20.patch new file mode 100644 index 000000000000..6bb4f677541b --- /dev/null +++ b/pkgs/tools/misc/grub/glibc-2.20.patch @@ -0,0 +1,29 @@ +* 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 <address@hidden> + +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 <config-util.h> + ++/* 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 <grub/fs.h> + #include <grub/file.h> + #include <grub/disk.h> +-- +2.1.0 |