* Merge diff between trunk/pkgs@1646 and branches/nixos-pkgs@2256;

this contains mostly Armijn's pure stdenv-linux.

* After unpacking the statically linked GCC, patch all store paths to
  /nix/store/ffffffffffffffffffffffffffffffff.  Ugly hack to prevent
  undeclared references but it works.

* We don't need Glib's dynamic libraries in the first bootstrap stage;
  delete them.  Actually the downloaded Glibc binary is only needed
  for building Glibc, since GCC needs a C compiler to build some
  programs in `configure'.  So static linking is fine for that.  Maybe
  it would be better to patch `configure' so that we don't need a
  pre-built Glibc at all.

* Set the svn:executable property on `cp' and `patchelf'.

* In Glibc, revert to LinuxThreads.  Maybe NPTL will work, but TLS
  support is a problem.

* Delete most Glibc patches; they're no longer needed since the branch
  updated it to 20050110.
  
* Some cleanups.

svn path=/nixpkgs/trunk/; revision=2258

This commit is contained in:

Eelco Dolstra

2005-02-21 16:03:34 +00:00

parent cdaecff49f 8125cd8915

commit e6744d0f89

35 changed files with 474 additions and 862 deletions

									
										pkgs/os-specific/linux/net-tools/default.nix
									
		+1
		
												View File
												
				@@ -8,4 +8,5 @@ stdenv.mkDerivation {

				    md5 = "888774accab40217dde927e21979c165";

				  };

				  config = ./config.h;

				  patch = ./net-tools-labels.patch;

				}