BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* binutils on dietlibc.

Browse source 
* Pass -lcompat by default in the dietlibc stdenv.

svn path=/nixpkgs/trunk/; revision=6770
This commit is contained in:
Eelco Dolstra 2006-10-19 11:03:20 +00:00
parent c696045af0
commit 6b03da43d9
5 changed files with 6 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/tools/misc/binutils-static/binutils-2.17.nix
View file

@ -1,11 +0,0 @@
{stdenv, fetchurl, noSysDirs}:
stdenv.mkDerivation {
name = "binutils-2.17";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/binutils-2.17.tar.bz2;
md5 = "e26e2e06b6e4bf3acf1dc8688a94c0d1";
};
inherit noSysDirs;
}

21
pkgs/development/tools/misc/binutils-static/builder.sh
View file

@ -1,21 +0,0 @@
source $stdenv/setup
configureFlags=" --disable-nls --disable-shared --enable-static"
makeFlags="LDFLAGS=-all-static"
patchConfigure() {
# Clear the default library search path.
if test "$noSysDirs" = "1"; then
echo 'NATIVE_LIB_DIRS=' >> ld/configure.tgt
fi
}
preConfigure=patchConfigure
preBuild() {
make configure-host
}
preBuild=preBuild
genericBuild

11
pkgs/development/tools/misc/binutils-static/default.nix
View file

@ -1,11 +0,0 @@
{stdenv, fetchurl, noSysDirs}:
stdenv.mkDerivation {
name = "binutils-2.16.1";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/binutils-2.16.1.tar.bz2;
md5 = "6a9d529efb285071dad10e1f3d2b2967";
};
inherit noSysDirs;
}

2
pkgs/shells/bash/default.nix
View file

@ -13,9 +13,7 @@ stdenv.mkDerivation ({
};
}
# libcompat.a is needed on dietlibc for stpcpy().
// (if stdenv ? isDietLibC then {
NIX_LDFLAGS = "-lcompat";
patches = [./winsize.patch];
} else {})

8
pkgs/top-level/all-packages.nix
View file

@ -79,6 +79,9 @@ rec {
useDietLibC = stdenv: stdenv //
{ mkDerivation = args: stdenv.mkDerivation (args // {
NIX_CFLAGS_LINK = "-static";
# libcompat.a contains some commonly used functions.
NIX_LDFLAGS = "-lcompat";
# These are added *after* the command-line flags, so we'll
# always optimise for size.
@ -979,8 +982,9 @@ rec {
cross = "sparc-linux";
};
binutilsStatic = import ../development/tools/misc/binutils-static {
inherit fetchurl stdenv noSysDirs;
binutilsDiet = import ../development/tools/misc/binutils/binutils-2.17.nix {
inherit fetchurl noSysDirs;
stdenv = useDietLibC stdenv;
};
bison = bison1875;