Unverified Commit bcf241d3 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

gnat14: add aarch64-linux support (#387468)

parents 71740ceb 7a40edc3

pkgs/development/compilers/gnat-bootstrap/default.nix

+12 −2
Original line number Diff line number Diff line 
{ 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 ];

  };

})

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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