Merge pull request #44386 from srdqty/srd-update-mlton-compiler
mlton: refactor and adds mlton20180207Binary mlton20180207 mltonHEAD
This commit is contained in:
Matthew Bauer
GitHub
commit
0881a55f81
118
pkgs/development/compilers/mlton/20130715.nix
Normal file
118
pkgs/development/compilers/mlton/20130715.nix
Normal file
@ -0,0 +1,118 @@
|
||||
{ stdenv, fetchurl, patchelf, gmp }:
|
||||
|
||||
let
|
||||
version = "20130715";
|
||||
|
||||
usr_prefix = if stdenv.isDarwin then "usr/local" else "usr";
|
||||
|
||||
dynamic_linker = stdenv.cc.bintools.dynamicLinker;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mlton-${version}";
|
||||
|
||||
binSrc =
|
||||
if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
|
||||
url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz";
|
||||
sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j";
|
||||
})
|
||||
else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
|
||||
url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz";
|
||||
sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn";
|
||||
})
|
||||
else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl {
|
||||
url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
|
||||
sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9";
|
||||
})
|
||||
else throw "Architecture not supported";
|
||||
|
||||
codeSrc =
|
||||
fetchurl {
|
||||
url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz";
|
||||
sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11";
|
||||
};
|
||||
|
||||
srcs = [ binSrc codeSrc ];
|
||||
|
||||
sourceRoot = name;
|
||||
|
||||
buildInputs = [ gmp ];
|
||||
nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
|
||||
|
||||
makeFlags = [ "all-no-docs" ];
|
||||
|
||||
configurePhase = ''
|
||||
# Fix paths in the source.
|
||||
find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@"
|
||||
|
||||
substituteInPlace $(pwd)/Makefile --replace '/bin/cp' $(type -p cp)
|
||||
substituteInPlace bin/mlton-script --replace gcc cc
|
||||
substituteInPlace bin/regression --replace gcc cc
|
||||
substituteInPlace lib/mlnlffi-lib/Makefile --replace gcc cc
|
||||
substituteInPlace mlnlffigen/gen-cppcmd --replace gcc cc
|
||||
substituteInPlace runtime/Makefile --replace gcc cc
|
||||
substituteInPlace ../${usr_prefix}/bin/mlton --replace gcc cc
|
||||
|
||||
# Fix paths in the binary distribution.
|
||||
BIN_DIST_DIR="$(pwd)/../${usr_prefix}"
|
||||
for f in "bin/mlton" "lib/mlton/platform" "lib/mlton/static-library" ; do
|
||||
substituteInPlace "$BIN_DIST_DIR/$f" --replace '/${usr_prefix}/bin/env bash' $(type -p bash)
|
||||
done
|
||||
|
||||
substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton
|
||||
'' + stdenv.lib.optionalString stdenv.cc.isClang ''
|
||||
sed -i "s_ patch -s -p0 <gdtoa.hide-public-fns.patch_ patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
# To build the source we have to put the binary distribution in the $PATH.
|
||||
export PATH="$PATH:$(pwd)/../${usr_prefix}/bin/"
|
||||
|
||||
# Let the builder execute the binary distribution.
|
||||
chmod u+x $(pwd)/../${usr_prefix}/bin/mllex
|
||||
chmod u+x $(pwd)/../${usr_prefix}/bin/mlyacc
|
||||
chmod u+x $(pwd)/../${usr_prefix}/bin/mlton
|
||||
|
||||
# So the builder runs the binary compiler with gmp.
|
||||
export LD_LIBRARY_PATH=${gmp.out}/lib:$LD_LIBRARY_PATH
|
||||
|
||||
'' + stdenv.lib.optionalString stdenv.isLinux ''
|
||||
# Patch ELF interpreter.
|
||||
patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
|
||||
for e in mllex mlyacc ; do
|
||||
patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e
|
||||
done
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
# Patch libgmp linking
|
||||
install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
|
||||
install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc
|
||||
install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mllex
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
installTargets = [ "install-no-docs" ];
|
||||
|
||||
postInstall = ''
|
||||
# Fix path to mlton libraries.
|
||||
substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $out/lib/mlton
|
||||
|
||||
# Path to libgmp.
|
||||
substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-link-opt '-lm -lgmp'" "-link-opt '-lm -lgmp -L${gmp.out}/lib'"
|
||||
|
||||
# Path to gmp.h.
|
||||
substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-cc-opt '-O1 -fno-common'" "-cc-opt '-O1 -fno-common -I${gmp.dev}/include'"
|
||||
|
||||
# Path to the same cc used in the build; needed at runtime.
|
||||
substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "gcc='gcc'" "gcc='"$(type -p cc)"'"
|
||||
|
||||
# Copy files to final positions.
|
||||
cp -r $(pwd)/install/${usr_prefix}/bin $out
|
||||
cp -r $(pwd)/install/${usr_prefix}/lib $out
|
||||
cp -r $(pwd)/install/${usr_prefix}/man $out
|
||||
'';
|
||||
|
||||
meta = import ./meta.nix;
|
||||
}
|
||||
57
pkgs/development/compilers/mlton/20180207-binary.nix
Normal file
57
pkgs/development/compilers/mlton/20180207-binary.nix
Normal file
@ -0,0 +1,57 @@
|
||||
{ stdenv, fetchurl, patchelf, gmp }:
|
||||
let
|
||||
dynamic-linker = stdenv.cc.bintools.dynamicLinker;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mlton-${version}";
|
||||
version = "20180207";
|
||||
|
||||
src = if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
|
||||
url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-linux.tgz";
|
||||
sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf";
|
||||
})
|
||||
else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl {
|
||||
url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${name}-1.amd64-darwin.gmp-static.tgz";
|
||||
sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv";
|
||||
})
|
||||
else
|
||||
throw "Architecture not supported";
|
||||
|
||||
buildInputs = [ gmp ];
|
||||
nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
|
||||
|
||||
buildPhase = ''
|
||||
make update \
|
||||
CC="$(type -p cc)" \
|
||||
WITH_GMP_INC_DIR="${gmp.dev}/include" \
|
||||
WITH_GMP_LIB_DIR="${gmp}/lib"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
make install PREFIX=$out
|
||||
'';
|
||||
|
||||
postFixup = stdenv.lib.optionalString stdenv.isLinux ''
|
||||
patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile
|
||||
patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile
|
||||
|
||||
for e in mllex mlnlffigen mlprof mlyacc; do
|
||||
patchelf --set-interpreter ${dynamic-linker} $out/bin/$e
|
||||
patchelf --set-rpath ${gmp}/lib $out/bin/$e
|
||||
done
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
install_name_tool -change \
|
||||
/opt/local/lib/libgmp.10.dylib \
|
||||
${gmp}/lib/libgmp.10.dylib \
|
||||
$out/lib/mlton/mlton-compile
|
||||
|
||||
for e in mllex mlnlffigen mlprof mlyacc; do
|
||||
install_name_tool -change \
|
||||
/opt/local/lib/libgmp.10.dylib \
|
||||
${gmp}/lib/libgmp.10.dylib \
|
||||
$out/bin/$e
|
||||
done
|
||||
'';
|
||||
|
||||
meta = import ./meta.nix;
|
||||
}
|
||||
@ -1,134 +1,26 @@
|
||||
{ stdenv, fetchurl, patchelf, gmp }:
|
||||
{ stdenv, fetchurl, fetchgit, patchelf, gmp }:
|
||||
rec {
|
||||
mlton20130715 = import ./20130715.nix {
|
||||
inherit stdenv fetchurl patchelf gmp;
|
||||
};
|
||||
|
||||
let
|
||||
version = "20130715";
|
||||
mlton20180207Binary = import ./20180207-binary.nix {
|
||||
inherit stdenv fetchurl patchelf gmp;
|
||||
};
|
||||
|
||||
usr_prefix = if stdenv.isDarwin then "usr/local" else "usr";
|
||||
mlton20180207 = import ./from-git-source.nix {
|
||||
mltonBootstrap = mlton20180207Binary;
|
||||
version = "20180207";
|
||||
rev = "on-20180207-release";
|
||||
sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a";
|
||||
inherit stdenv fetchgit gmp;
|
||||
};
|
||||
|
||||
dynamic_linker =
|
||||
if stdenv.isx86_64 then "${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2"
|
||||
else "${stdenv.glibc.out}/lib/ld-linux.so.2";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mlton-${version}";
|
||||
|
||||
binSrc =
|
||||
if stdenv.hostPlatform.system == "i686-linux" then (fetchurl {
|
||||
url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.x86-linux.tgz";
|
||||
sha256 = "1kxjjmnw4xk2d9hpvz43w9dvyhb3025k4zvjx785c33nrwkrdn4j";
|
||||
})
|
||||
else if stdenv.hostPlatform.system == "x86_64-linux" then (fetchurl {
|
||||
url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-linux.tgz";
|
||||
sha256 = "0fyhwxb4nmpirjbjcvk9f6w67gmn2gkz7xcgz0xbfih9kc015ygn";
|
||||
})
|
||||
else if stdenv.hostPlatform.system == "x86_64-darwin" then (fetchurl {
|
||||
url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}-1.amd64-darwin.gmp-macports.tgz";
|
||||
sha256 = "044wnh9hhg6if886xy805683k0as347xd37r0r1yi4x7qlxzzgx9";
|
||||
})
|
||||
else throw "Architecture not supported";
|
||||
|
||||
codeSrc =
|
||||
fetchurl {
|
||||
url = "mirror://sourceforge/project/mlton/mlton/${version}/${name}.src.tgz";
|
||||
sha256 = "0v1x2hrh9hiqkvnbq11kf34v4i5a2x0ffxbzqaa8skyl26nmfn11";
|
||||
};
|
||||
|
||||
srcs = [ binSrc codeSrc ];
|
||||
|
||||
sourceRoot = name;
|
||||
|
||||
buildInputs = [ gmp ];
|
||||
nativeBuildInputs = stdenv.lib.optional stdenv.isLinux patchelf;
|
||||
|
||||
makeFlags = [ "all-no-docs" ];
|
||||
|
||||
configurePhase = ''
|
||||
# Fix paths in the source.
|
||||
find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@"
|
||||
|
||||
substituteInPlace $(pwd)/Makefile --replace '/bin/cp' $(type -p cp)
|
||||
substituteInPlace bin/mlton-script --replace gcc cc
|
||||
substituteInPlace bin/regression --replace gcc cc
|
||||
substituteInPlace lib/mlnlffi-lib/Makefile --replace gcc cc
|
||||
substituteInPlace mlnlffigen/gen-cppcmd --replace gcc cc
|
||||
substituteInPlace runtime/Makefile --replace gcc cc
|
||||
substituteInPlace ../${usr_prefix}/bin/mlton --replace gcc cc
|
||||
|
||||
# Fix paths in the binary distribution.
|
||||
BIN_DIST_DIR="$(pwd)/../${usr_prefix}"
|
||||
for f in "bin/mlton" "lib/mlton/platform" "lib/mlton/static-library" ; do
|
||||
substituteInPlace "$BIN_DIST_DIR/$f" --replace '/${usr_prefix}/bin/env bash' $(type -p bash)
|
||||
done
|
||||
|
||||
substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton
|
||||
'' + stdenv.lib.optionalString stdenv.cc.isClang ''
|
||||
sed -i "s_ patch -s -p0 <gdtoa.hide-public-fns.patch_ patch -s -p0 <gdtoa.hide-public-fns.patch\n\tsed -i 's|printf(emptyfmt|printf(\"\"|g' ./gdtoa/arithchk.c_" ./runtime/Makefile
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
sed -i 's|XCFLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include||' ./runtime/Makefile
|
||||
'';
|
||||
|
||||
preBuild = ''
|
||||
# To build the source we have to put the binary distribution in the $PATH.
|
||||
export PATH="$PATH:$(pwd)/../${usr_prefix}/bin/"
|
||||
|
||||
# Let the builder execute the binary distribution.
|
||||
chmod u+x $(pwd)/../${usr_prefix}/bin/mllex
|
||||
chmod u+x $(pwd)/../${usr_prefix}/bin/mlyacc
|
||||
chmod u+x $(pwd)/../${usr_prefix}/bin/mlton
|
||||
|
||||
# So the builder runs the binary compiler with gmp.
|
||||
export LD_LIBRARY_PATH=${gmp.out}/lib:$LD_LIBRARY_PATH
|
||||
|
||||
'' + stdenv.lib.optionalString stdenv.isLinux ''
|
||||
# Patch ELF interpreter.
|
||||
patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
|
||||
for e in mllex mlyacc ; do
|
||||
patchelf --set-interpreter ${dynamic_linker} $(pwd)/../${usr_prefix}/bin/$e
|
||||
done
|
||||
'' + stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
# Patch libgmp linking
|
||||
install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/lib/mlton/mlton-compile
|
||||
install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mlyacc
|
||||
install_name_tool -change /opt/local/lib/libgmp.10.dylib ${gmp}/lib/libgmp.10.dylib $(pwd)/../${usr_prefix}/bin/mllex
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
installTargets = [ "install-no-docs" ];
|
||||
|
||||
postInstall = ''
|
||||
# Fix path to mlton libraries.
|
||||
substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $out/lib/mlton
|
||||
|
||||
# Path to libgmp.
|
||||
substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-link-opt '-lm -lgmp'" "-link-opt '-lm -lgmp -L${gmp.out}/lib'"
|
||||
|
||||
# Path to gmp.h.
|
||||
substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-cc-opt '-O1 -fno-common'" "-cc-opt '-O1 -fno-common -I${gmp.dev}/include'"
|
||||
|
||||
# Path to the same cc used in the build; needed at runtime.
|
||||
substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "gcc='gcc'" "gcc='"$(type -p cc)"'"
|
||||
|
||||
# Copy files to final positions.
|
||||
cp -r $(pwd)/install/${usr_prefix}/bin $out
|
||||
cp -r $(pwd)/install/${usr_prefix}/lib $out
|
||||
cp -r $(pwd)/install/${usr_prefix}/man $out
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Open-source, whole-program, optimizing Standard ML compiler";
|
||||
longDescription = ''
|
||||
MLton is an open source, whole-program optimizing compiler for the Standard ML programming language.
|
||||
MLton aims to produce fast executables, and to encourage rapid prototyping and modular programming
|
||||
by eliminating performance penalties often associated with the use of high-level language features.
|
||||
MLton development began in 1997, and continues to this day with a growing worldwide community of
|
||||
developers and users, who have helped to port MLton to a number of platforms.
|
||||
Description taken from http://en.wikipedia.org/wiki/Mlton .
|
||||
'';
|
||||
|
||||
homepage = http://mlton.org/;
|
||||
license = "bsd";
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"];
|
||||
mltonHEAD = import ./from-git-source.nix {
|
||||
mltonBootstrap = mlton20180207Binary;
|
||||
version = "HEAD";
|
||||
rev = "e149c9917cfbfe6aba5c986a958ed76d5cc6cfde";
|
||||
sha256 = "0a0j1i0f0fxw2my1309srq5j3vz0kawrrln01gxms2m5hy5dl50d";
|
||||
inherit stdenv fetchgit gmp;
|
||||
};
|
||||
}
|
||||
|
||||
35
pkgs/development/compilers/mlton/from-git-source.nix
Normal file
35
pkgs/development/compilers/mlton/from-git-source.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ fetchgit
|
||||
, gmp
|
||||
, mltonBootstrap
|
||||
, url ? "https://github.com/mlton/mlton"
|
||||
, rev
|
||||
, sha256
|
||||
, stdenv
|
||||
, version
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "mlton-${version}";
|
||||
|
||||
src = fetchgit {
|
||||
inherit url rev sha256;
|
||||
};
|
||||
|
||||
buildInputs = [mltonBootstrap gmp];
|
||||
|
||||
preBuild = ''
|
||||
find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@"
|
||||
|
||||
makeFlagsArray=(
|
||||
MLTON_VERSION="${version} ${rev}"
|
||||
CC="$(type -p cc)"
|
||||
PREFIX="$out"
|
||||
WITH_GMP_INC_DIR="${gmp.dev}/include"
|
||||
WITH_GMP_LIB_DIR="${gmp}/lib"
|
||||
)
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = import ./meta.nix;
|
||||
}
|
||||
15
pkgs/development/compilers/mlton/meta.nix
Normal file
15
pkgs/development/compilers/mlton/meta.nix
Normal file
@ -0,0 +1,15 @@
|
||||
{
|
||||
description = "Open-source, whole-program, optimizing Standard ML compiler";
|
||||
longDescription = ''
|
||||
MLton is an open source, whole-program optimizing compiler for the Standard ML programming language.
|
||||
MLton aims to produce fast executables, and to encourage rapid prototyping and modular programming
|
||||
by eliminating performance penalties often associated with the use of high-level language features.
|
||||
MLton development began in 1997, and continues to this day with a growing worldwide community of
|
||||
developers and users, who have helped to port MLton to a number of platforms.
|
||||
Description taken from http://en.wikipedia.org/wiki/Mlton .
|
||||
'';
|
||||
|
||||
homepage = http://mlton.org/;
|
||||
license = "bsd";
|
||||
platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"];
|
||||
}
|
||||
@ -7174,7 +7174,13 @@ with pkgs;
|
||||
|
||||
mkcl = callPackage ../development/compilers/mkcl {};
|
||||
|
||||
mlton = callPackage ../development/compilers/mlton { };
|
||||
inherit (callPackage ../development/compilers/mlton {})
|
||||
mlton20130715
|
||||
mlton20180207Binary
|
||||
mlton20180207
|
||||
mltonHEAD;
|
||||
|
||||
mlton = mlton20180207;
|
||||
|
||||
mono = mono5;
|
||||
mono5 = mono58;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user