Apparently fixed GCL build
svn path=/nixpkgs/trunk/; revision=22498
This commit is contained in:
parent
3f92e4d2c8
commit
058ccd7714
|
@ -1,18 +1,19 @@
|
|||
a :
|
||||
let
|
||||
buildInputs = with a; [
|
||||
mpfr m4 binutils emacs
|
||||
mpfr m4 binutils emacs gmp
|
||||
libX11 xproto inputproto libXi
|
||||
libXext xextproto libXt libXaw libXmu
|
||||
zlib which
|
||||
];
|
||||
in
|
||||
rec {
|
||||
src = a.fetchcvs {
|
||||
cvsRoot = ":pserver:anonymous@cvs.sv.gnu.org:/sources/gcl";
|
||||
module = "gcl";
|
||||
tag = "Version_2_6_8pre";
|
||||
date = "2009-11-05";
|
||||
sha256 = "5aa6c1616f585466a6aae91e38472f20539be4ce978fd458592e425904bdd9bc";
|
||||
# tag = "Version_2_6_8pre";
|
||||
date = "2010-07-01";
|
||||
sha256 = "a61d1bf669fd11d13050e8e1ab850a5eecb38126b47c744c3e21646773c4fb4d";
|
||||
};
|
||||
|
||||
name = "gcl-2.6.8pre";
|
||||
|
@ -20,11 +21,16 @@ rec {
|
|||
configureFlags = [];
|
||||
|
||||
preBuild = a.fullDepEntry (''
|
||||
echo '(defun init_gcl_cmpmap (&rest args))' >> cmpnew/cmpmap.lsp
|
||||
sed -re "s@/bin/cat@$(which cat)@g" -i configure */configure
|
||||
sed -re "s@if test -d /proc/self @if false @" -i configure
|
||||
sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.gcc.gcc}/include -I${a.stdenv.gcc.libc}/include ^g' -i makefile
|
||||
'') ["minInit" "doUnpack"];
|
||||
|
||||
fixConfigure = a.doPatchShebangs ".";
|
||||
|
||||
/* doConfigure should be removed if not needed */
|
||||
phaseNames = ["preBuild" "doConfigure" "doMakeInstall"];
|
||||
phaseNames = ["doUnpack" "fixConfigure" "preBuild"
|
||||
"doConfigure" "doMakeInstall"];
|
||||
|
||||
meta = {
|
||||
description = "GNU Common Lisp compiler working via GCC";
|
||||
|
|
|
@ -2336,16 +2336,13 @@ let
|
|||
enableMultilib = false;
|
||||
}));
|
||||
|
||||
/*
|
||||
Broken; fails because of unability to find its own symbols during linking
|
||||
|
||||
gcl = builderDefsPackage ../development/compilers/gcl {
|
||||
inherit mpfr m4 binutils fetchcvs emacs;
|
||||
inherit mpfr m4 binutils fetchcvs emacs zlib which
|
||||
gmp;
|
||||
inherit (xlibs) libX11 xproto inputproto libXi
|
||||
libXext xextproto libXt libXaw libXmu;
|
||||
stdenv = (overrideGCC stdenv gcc34) // {gcc = gcc33;};
|
||||
inherit stdenv;
|
||||
};
|
||||
*/
|
||||
|
||||
# GHC
|
||||
|
||||
|
|
Loading…
Reference in a new issue