refind: 0.12.0 -> 0.13.0 (#113328)
This commit is contained in:
parent
b29675a553
commit
7260e7c1e8
|
@ -1,25 +0,0 @@
|
||||||
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
|
|
||||||
|
|
|
@ -14,17 +14,16 @@ in
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "refind";
|
pname = "refind";
|
||||||
version = "0.12.0";
|
version = "0.13.0";
|
||||||
srcName = "refind-src-${version}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz";
|
url = "mirror://sourceforge/project/refind/${version}/${pname}-src-${version}.tar.gz";
|
||||||
sha256 = "1i5p3sir3mx4i2q5w78360xn2kbgsj8rmgrqvsvag1zzr5dm1f3v";
|
sha256 = "0zivlcw1f3zwnrwvbhwq6gg781hh72g2bhc2cxcsb2zmg7q8in65";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
# Removes hardcoded toolchain for aarch64, allowing successful aarch64 builds.
|
||||||
./0001-toolchain.patch
|
./0001-toolchain.patch
|
||||||
./0001-Fix-GCC-10-compile-problem.patch
|
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [ gnu-efi ];
|
buildInputs = [ gnu-efi ];
|
||||||
|
@ -44,6 +43,8 @@ stdenv.mkDerivation rec {
|
||||||
buildFlags = [ "gnuefi" "fs_gnuefi" ];
|
buildFlags = [ "gnuefi" "fs_gnuefi" ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
|
runHook preInstall
|
||||||
|
|
||||||
install -d $out/bin/
|
install -d $out/bin/
|
||||||
install -d $out/share/refind/drivers_${efiPlatform}/
|
install -d $out/share/refind/drivers_${efiPlatform}/
|
||||||
install -d $out/share/refind/tools_${efiPlatform}/
|
install -d $out/share/refind/tools_${efiPlatform}/
|
||||||
|
@ -102,6 +103,8 @@ stdenv.mkDerivation rec {
|
||||||
sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-install
|
sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-install
|
||||||
sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mvrefind
|
sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mvrefind
|
||||||
sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont
|
sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont
|
||||||
|
|
||||||
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
Loading…
Reference in a new issue