git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #93347 from symphorien/spacetime

Ocaml spacetime support

commit1fe7fee5925e809788341af52af0f6fd231a86fe authorSilvan Mosberger <contact@infinisil.com> dateSat 22 Aug 2020, 16:38 (6 years ago) parent419f7913ede620
2 files changed+11−2
pkgs/development/compilers/ocaml/generic.nix+6−2 pkgs/development/tools/ocaml/camlp4/default.nix+5
pkgs/development/compilers/ocaml/generic.nix+6−2
@@ -10,20 +10,22 @@ let
1010 safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips);
1111in
1212
13−{ stdenv, fetchurl, ncurses, buildEnv
13+{ stdenv, fetchurl, ncurses, buildEnv, libunwind
1414, libX11, xorgproto, useX11 ? safeX11 stdenv && !stdenv.lib.versionAtLeast version "4.09"
1515, aflSupport ? false
1616, flambdaSupport ? false
17+, spaceTimeSupport ? false
1718}:
1819
1920assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips;
2021assert aflSupport -> stdenv.lib.versionAtLeast version "4.05";
2122assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03";
23+assert spaceTimeSupport -> stdenv.lib.versionAtLeast version "4.04";
2224
2325let
2426 useNativeCompilers = !stdenv.isMips;
2527 inherit (stdenv.lib) optional optionals optionalString;
26− name = "ocaml${optionalString aflSupport "+afl"}${optionalString flambdaSupport "+flambda"}-${version}";
28+ name = "ocaml${optionalString aflSupport "+afl"}${optionalString spaceTimeSupport "+spacetime"}${optionalString flambdaSupport "+flambda"}-${version}";
2729in
2830
2931let
@@ -53,11 +55,13 @@ stdenv.mkDerivation (args // {
5355 [ "-x11lib" x11lib "-x11include" x11inc ])
5456 ++ optional aflSupport (flags "--with-afl" "-afl-instrument")
5557 ++ optional flambdaSupport (flags "--enable-flambda" "-flambda")
58+ ++ optional spaceTimeSupport (flags "--enable-spacetime" "-spacetime")
5659 ;
5760
5861 buildFlags = [ "world" ] ++ optionals useNativeCompilers [ "bootstrap" "world.opt" ];
5962 buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses
6063 ++ optionals useX11 [ libX11 xorgproto ];
64+ propagatedBuildInputs = optional spaceTimeSupport libunwind;
6165 installTargets = [ "install" ] ++ optional useNativeCompilers "installopt";
6266 preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") ''
6367 CAT=$(type -tp cat)
pkgs/development/tools/ocaml/camlp4/default.nix+5
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
4343 dontAddPrefix = true;
4444
4545 preConfigure = ''
46+ # increase stack space for spacetime variant of the compiler
47+ # https://github.com/ocaml/ocaml/issues/7435
48+ # but disallowed by darwin sandbox
49+ ulimit -s unlimited || true
50+
4651 configureFlagsArray=(
4752 --bindir=$out/bin
4853 --libdir=$out/lib/ocaml/${ocaml.version}/site-lib