public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpc: add support for aarch64-linux

Browse Source 
Supported since fpc 3.2.0.
This commit is contained in:
Timo Kaufmann 2020-09-03 12:51:31 +02:00
parent f928b91f34
commit 6ff5c406eb
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/compilers/fpc/binary.nix
View File

@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}-x86_64-linux.tar"; url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}-x86_64-linux.tar";
sha256 = "0gfbwjvjqlx0562ayyl08khagslrws758al2yhbi4bz5rzk554ni"; sha256 = "0gfbwjvjqlx0562ayyl08khagslrws758al2yhbi4bz5rzk554ni";
} }
else if stdenv.hostPlatform.system == "aarch64-linux" then
fetchurl {
url = "mirror://sourceforge/project/freepascal/Linux/${version}/fpc-${version}.aarch64-linux.tar";
sha256 = "1h481ngg3m8nlsg9mw7rr1bn2c4sj4wzqny9bxyq3xvcral12r71";
}
else throw "Not supported on ${stdenv.hostPlatform.system}."; else throw "Not supported on ${stdenv.hostPlatform.system}.";
builder = ./binary-builder.sh; builder = ./binary-builder.sh;

11
pkgs/development/compilers/fpc/mark-paths.patch
View File

@ -1,5 +1,5 @@
diff --git a/fpcsrc/compiler/systems/t_linux.pas b/fpcsrc/compiler/systems/t_linux.pas diff --git a/fpcsrc/compiler/systems/t_linux.pas b/fpcsrc/compiler/systems/t_linux.pas
index a7398fb9..a1e41ecb 100644 index a7398fb9..8e46fec0 100644
--- a/fpcsrc/compiler/systems/t_linux.pas --- a/fpcsrc/compiler/systems/t_linux.pas
+++ b/fpcsrc/compiler/systems/t_linux.pas +++ b/fpcsrc/compiler/systems/t_linux.pas
@@ -135,13 +135,13 @@ begin @@ -135,13 +135,13 @@ begin
@ -19,6 +19,15 @@ index a7398fb9..a1e41ecb 100644
{$else powerpc64} {$else powerpc64}
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true); LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true);
{$endif powerpc64} {$endif powerpc64}
@@ -164,7 +164,7 @@ begin
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/i386-linux-gnu',true);
{$endif i386}
{$ifdef aarch64}
- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/aarch64-linux-gnu',true);
+ LibrarySearchPath.AddLibraryPath(sysrootpath,'=@syslibpath@',true);
{$endif aarch64}
{$ifdef powerpc}
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/powerpc-linux-gnu',true);
@@ -185,53 +185,53 @@ begin @@ -185,53 +185,53 @@ begin
end; end;