diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2010-07-06 16:48:03 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2010-07-06 16:48:03 +0000 |
| commit | 058ccd771406751beba4fd4da6da8e1a3b780abe (patch) | |
| tree | 01279885fd0c5c3781e50db042513eaedce700b0 /pkgs | |
| parent | 3f92e4d2c88e5ebe49de05c200fafb46b8e6a6bc (diff) | |
| download | nixlib-058ccd771406751beba4fd4da6da8e1a3b780abe.tar nixlib-058ccd771406751beba4fd4da6da8e1a3b780abe.tar.gz nixlib-058ccd771406751beba4fd4da6da8e1a3b780abe.tar.bz2 nixlib-058ccd771406751beba4fd4da6da8e1a3b780abe.tar.lz nixlib-058ccd771406751beba4fd4da6da8e1a3b780abe.tar.xz nixlib-058ccd771406751beba4fd4da6da8e1a3b780abe.tar.zst nixlib-058ccd771406751beba4fd4da6da8e1a3b780abe.zip | |
Apparently fixed GCL build
svn path=/nixpkgs/trunk/; revision=22498
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/gcl/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
2 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index 9c88dc67cf80..1a86b878d928 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68038c98c450..b846693073cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 |