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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/glibc/default.nix
+4 -33
View File
@@ -3,43 +3,14 @@
stdenv.mkDerivation {
name = "glibc-2.3.3";
builder = ./builder.sh;
substitute = ../../../build-support/substitute/substitute.sh;
src = fetchurl {
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glibc-2.3.3.tar.bz2;
md5 = "e825807b98042f807799ccc9dd96d31b";
};
linuxthreadsSrc = fetchurl {
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glibc-linuxthreads-2.3.3.tar.bz2;
md5 = "8149ea62922e75bd692bc3b92e5e766b";
url = ftp://sources.redhat.com/pub/glibc/snapshots/glibc-20050110.tar.bz2;
md5 = "1171587e4802f43fdda315910adc1854";
};
patches = [
# This patch fixes the bug
# http://sources.redhat.com/bugzilla/show_bug.cgi?id=312. Note
# that this bug was marked as `WORKSFORME' with the comment to
# just use glibc from CVS. This and the unholy Linuxthreads/NPTL
# mess proves that glibc, together with the Linux kernel,
# constitutes an AXIS OF EVIL wrt release management. Patch
# obtained from
# http://www.pengutronix.de/software/ptxdist/patches-cvs/glibc-2.3.2/generic/fixup.patch.
./fixup.patch
# Likewise, this fixes the bug reported in
# http://sources.redhat.com/ml/libc-alpha/2003-07/msg00117.html.
# Die, glibc, die.
./no-unit-at-a-time.patch
# This is a patch to make glibc compile under GCC 3.3. Presumably
# later releases of glibc won't need this.
# ./glibc-2.3.2-sscanf-1.patch
# Fix for localedata loading bug.
./loadlocale.patch
# Add a whole bunch of UTF-8 locales. Most of these seem to be in
# the CVS mainline now.
./utf8-locales.patch
];
patches = [ ./glibc-pwd.patch ];
inherit kernelHeaders installLocales;
}