summary refs log tree commit diff
diff options
context:
space:
mode:
authorLucas Ransan <lucas@ransan.tk>2020-12-21 18:53:01 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2020-12-28 08:43:32 +0100
commit1c89832fd5cb1c3be4a5bb9b483e219b06db0f25 (patch)
tree1e1a21f986339f69d0f7efc22c5ffd135448252d
parent188f1375d869c92c97be88ec110e913deec0c40e (diff)
downloadnixpkgs-1c89832fd5cb1c3be4a5bb9b483e219b06db0f25.tar
nixpkgs-1c89832fd5cb1c3be4a5bb9b483e219b06db0f25.tar.gz
nixpkgs-1c89832fd5cb1c3be4a5bb9b483e219b06db0f25.tar.bz2
nixpkgs-1c89832fd5cb1c3be4a5bb9b483e219b06db0f25.tar.lz
nixpkgs-1c89832fd5cb1c3be4a5bb9b483e219b06db0f25.tar.xz
nixpkgs-1c89832fd5cb1c3be4a5bb9b483e219b06db0f25.tar.zst
nixpkgs-1c89832fd5cb1c3be4a5bb9b483e219b06db0f25.zip
refind: fix build on gcc10
-rw-r--r--pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch25
-rw-r--r--pkgs/tools/bootloaders/refind/default.nix1
2 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch b/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch
new file mode 100644
index 00000000000..90b60235aad
--- /dev/null
+++ b/pkgs/tools/bootloaders/refind/0001-Fix-GCC-10-compile-problem.patch
@@ -0,0 +1,25 @@
+From e34a16301f425f273a67ed3abbc45840bc82d892 Mon Sep 17 00:00:00 2001
+From: srs5694 <srs5694@users.sourceforge.net>
+Date: Fri, 15 May 2020 12:34:14 -0400
+Subject: [PATCH] Fix GCC 10 compile problem
+
+---
+ Make.common | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Make.common b/Make.common
+index 3f0b919..95a3a97 100644
+--- a/Make.common
++++ b/Make.common
+@@ -60,7 +60,7 @@ endif
+ #
+ 
+ # ...for both GNU-EFI and TianoCore....
+-OPTIMFLAGS      = -Os -fno-strict-aliasing
++OPTIMFLAGS      = -Os -fno-strict-aliasing -fno-tree-loop-distribute-patterns
+ CFLAGS          = $(OPTIMFLAGS) -fno-stack-protector -fshort-wchar -Wall
+ 
+ # ...for GNU-EFI....
+-- 
+2.29.2
+
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 5c7c68d9d9e..76786c26d81 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./0001-toolchain.patch
+    ./0001-Fix-GCC-10-compile-problem.patch
   ];
 
   buildInputs = [ gnu-efi ];