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

* bclr: shrink fixes.patch from 3.6 MB (!) to 11 KB by not 

including Autoconf/Automake generated code.

svn path=/nixpkgs/trunk/; revision=22815
This commit is contained in:
Eelco Dolstra 2010-07-29 19:56:16 +00:00
parent 907bb1aac6
commit 20db67154c
4 changed files with 46 additions and 112138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/os-specific/linux/blcr/0.6.5.nix
View File

@ -1,28 +0,0 @@
args : with args;
assert args ? kernel;
rec {
src = fetchurl {
url = http://ftg.lbl.gov/CheckpointRestart/downloads/blcr-0.6.5.tar.gz ;
sha256 = "195gwxb38wmhzxr0jr349g6pxlwz6id2y6szv2akprv5ypy9py0g";
};
buildInputs = [perl];
configureFlags = [
"--with-linux=$(ls -d ${args.kernel}/lib/modules/*/build)"
"--with-kmod-dir=$out/lib/modules/$(cd ${args.kernel}/lib/modules; ls -d 2.6.*)"
"--with-system-map=${args.kernel}/System.map"
];
preConfigure = fullDepEntry (''
sed -e 's/FASTCALL//' -i configure configure.ac
sed -e 's/int (attach_pid/void (attach_pid/' -i configure configure.ac
'')["doUnpack" "minInit"];
/* doConfigure should be specified separately */
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
name = "blcr-" + version;
meta = {
description = "Berkley Labs Checkpointing/Restarting module (save process tree state)";
};
}

5
pkgs/os-specific/linux/blcr/0.8.2.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, kernel, perl, makeWrapper}: { stdenv, fetchurl, kernel, perl, makeWrapper, autoconf, automake, libtool }:
assert stdenv.isLinux; assert stdenv.isLinux;
@ -17,7 +17,7 @@ stdenv.mkDerivation {
patches = [ ./fixes.patch ]; patches = [ ./fixes.patch ];
buildInputs = [ perl makeWrapper ]; buildInputs = [ perl makeWrapper autoconf automake libtool ];
# this gives "configure: error: unrecognized option: `-d'" # this gives "configure: error: unrecognized option: `-d'"
/* /*
@ -29,6 +29,7 @@ stdenv.mkDerivation {
*/ */
configurePhase = '' configurePhase = ''
autoreconf
./configure --prefix=$out \ ./configure --prefix=$out \
--with-linux=$(ls -d ${kernel}/lib/modules/*/build) \ --with-linux=$(ls -d ${kernel}/lib/modules/*/build) \
--with-kmod-dir=$out/lib/modules/$(cd ${kernel}/lib/modules; ls -d 2.6.*) \ --with-kmod-dir=$out/lib/modules/$(cd ${kernel}/lib/modules; ls -d 2.6.*) \

112147
pkgs/os-specific/linux/blcr/fixes.patch
View File

File diff suppressed because it is too large Load Diff

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

@ -206,6 +206,7 @@ let
else else
stdenv; stdenv;
### BUILD SUPPORT ### BUILD SUPPORT
attrSetToDir = arg : import ../build-support/upstream-updater/attrset-to-dir.nix { attrSetToDir = arg : import ../build-support/upstream-updater/attrset-to-dir.nix {
@ -6584,7 +6585,8 @@ let
}; };
blcr = import ../os-specific/linux/blcr/0.8.2.nix { blcr = import ../os-specific/linux/blcr/0.8.2.nix {
inherit fetchurl stdenv kernel perl makeWrapper; inherit fetchurl stdenv kernel perl makeWrapper autoconf automake;
libtool = libtool_1_5; # libtool 2 causes a fork bomb
}; };
exmap = import ../os-specific/linux/exmap { exmap = import ../os-specific/linux/exmap {