gnat14: add aarch64-linux support

alire-project/GNAT-FSF-builds bootstrap binaries only exist since
version 14 so I couldn't add support for versions <14
This commit is contained in:
Basti Widua
2025-03-28 16:49:11 +01:00
committed by Weijia Wang
parent 54c581046b
commit 7a40edc3bc
2 changed files with 13 additions and 3 deletions
@@ -1,5 +1,5 @@
{ stdenv, lib, autoPatchelfHook, fetchzip, xz, ncurses5, ncurses, readline, gmp, mpfr
, expat, libipt, zlib, dejagnu, sourceHighlight, python3, elfutils, guile, glibc
, expat, libipt, zlib, dejagnu, sourceHighlight, python3, elfutils, guile, glibc, zstd
, majorVersion
}:
@@ -69,6 +69,11 @@ stdenv.mkDerivation(finalAttrs:
hash = "sha256-pH3IuOpCM9sY/ppTYcxBmgpsUiMrisIjmAa/rmmZXb4=";
upstreamTriplet = "x86_64-pc-linux-gnu";
};
aarch64-linux = {
inherit url;
hash = "sha256-SVW/0yyj6ZH1GAjvD+unII+zSLGd3KGFt1bjjQ3SEFU=";
upstreamTriplet = "aarch64-linux-gnu";
};
}.${stdenv.hostPlatform.system} or throwUnsupportedSystem;
};
inherit (versionMap.${majorVersion}) gccVersion alireRevision upstreamTriplet;
@@ -107,6 +112,11 @@ in {
ncurses5
] ++ [
xz
] ++ lib.optionals (lib.versionAtLeast majorVersion "14"
&& stdenv.hostPlatform.isAarch64
&& stdenv.hostPlatform.isLinux) [
# not sure why the bootstrap binaries link to zstd only on this architecture but they do
zstd
];
strictDeps = true;
@@ -187,7 +197,7 @@ in {
homepage = "https://www.gnu.org/software/gnat";
license = licenses.gpl3;
maintainers = with maintainers; [ ethindp ];
platforms = [ "x86_64-linux" "x86_64-darwin" ];
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
};
})
+1 -1
View File
@@ -5779,7 +5779,7 @@ with pkgs;
if stdenv.hostPlatform == stdenv.targetPlatform
&& stdenv.buildPlatform == stdenv.hostPlatform
then buildPackages.gnat-bootstrap14
else buildPackages.gnat13;
else buildPackages.gnat14;
stdenv =
if stdenv.hostPlatform == stdenv.targetPlatform
&& stdenv.buildPlatform == stdenv.hostPlatform