public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apparently fixed GCL build

Browse Source 
svn path=/nixpkgs/trunk/; revision=22498
This commit is contained in:
Michael Raskin 2010-07-06 16:48:03 +00:00
parent 3f92e4d2c8
commit 058ccd7714
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/compilers/gcl/default.nix
View File

@ -1,18 +1,19 @@
a : a :
let let
buildInputs = with a; [ buildInputs = with a; [
mpfr m4 binutils emacs mpfr m4 binutils emacs gmp
libX11 xproto inputproto libXi libX11 xproto inputproto libXi
libXext xextproto libXt libXaw libXmu libXext xextproto libXt libXaw libXmu
zlib which
]; ];
in in
rec { rec {
src = a.fetchcvs { src = a.fetchcvs {
cvsRoot = ":pserver:anonymous@cvs.sv.gnu.org:/sources/gcl"; cvsRoot = ":pserver:anonymous@cvs.sv.gnu.org:/sources/gcl";
module = "gcl"; module = "gcl";
tag = "Version_2_6_8pre"; # tag = "Version_2_6_8pre";
date = "2009-11-05"; date = "2010-07-01";
sha256 = "5aa6c1616f585466a6aae91e38472f20539be4ce978fd458592e425904bdd9bc"; sha256 = "a61d1bf669fd11d13050e8e1ab850a5eecb38126b47c744c3e21646773c4fb4d";
}; };
name = "gcl-2.6.8pre"; name = "gcl-2.6.8pre";
@ -20,11 +21,16 @@ rec {
configureFlags = []; configureFlags = [];
preBuild = a.fullDepEntry ('' 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"]; '') ["minInit" "doUnpack"];
fixConfigure = a.doPatchShebangs ".";
/* doConfigure should be removed if not needed */ /* doConfigure should be removed if not needed */
phaseNames = ["preBuild" "doConfigure" "doMakeInstall"]; phaseNames = ["doUnpack" "fixConfigure" "preBuild"
"doConfigure" "doMakeInstall"];
meta = { meta = {
description = "GNU Common Lisp compiler working via GCC"; description = "GNU Common Lisp compiler working via GCC";

9
pkgs/top-level/all-packages.nix
View File

@ -2336,16 +2336,13 @@ let
enableMultilib = false; enableMultilib = false;
})); }));
/*
Broken; fails because of unability to find its own symbols during linking
gcl = builderDefsPackage ../development/compilers/gcl { 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 inherit (xlibs) libX11 xproto inputproto libXi
libXext xextproto libXt libXaw libXmu; libXext xextproto libXt libXaw libXmu;
stdenv = (overrideGCC stdenv gcc34) // {gcc = gcc33;}; inherit stdenv;
}; };
*/
# GHC # GHC