diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-11-19 17:39:19 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-11-19 17:39:19 +0000 |
commit | b37f50468088d81237173a2a783098f1bf5178aa (patch) | |
tree | e033d8aed78dba5945cef1484035dae634a7e1f1 /pkgs/development/libraries/glibc | |
parent | 76f78aaf577282acad668df5cc1187dcad9dcdd7 (diff) | |
download | nixlib-b37f50468088d81237173a2a783098f1bf5178aa.tar nixlib-b37f50468088d81237173a2a783098f1bf5178aa.tar.gz nixlib-b37f50468088d81237173a2a783098f1bf5178aa.tar.bz2 nixlib-b37f50468088d81237173a2a783098f1bf5178aa.tar.lz nixlib-b37f50468088d81237173a2a783098f1bf5178aa.tar.xz nixlib-b37f50468088d81237173a2a783098f1bf5178aa.tar.zst nixlib-b37f50468088d81237173a2a783098f1bf5178aa.zip |
* Updated various stdenv packages (grep, gawk, tar, cpio, findutils,
pcre). svn path=/nixpkgs/branches/stdenv-updates/; revision=9758
Diffstat (limited to 'pkgs/development/libraries/glibc')
-rw-r--r-- | pkgs/development/libraries/glibc/builder.sh | 68 | ||||
-rw-r--r-- | pkgs/development/libraries/glibc/default.nix | 33 | ||||
-rw-r--r-- | pkgs/development/libraries/glibc/glibc-getcwd-param-MAX.patch | 14 | ||||
-rw-r--r-- | pkgs/development/libraries/glibc/glibc-pwd.patch | 74 |
4 files changed, 0 insertions, 189 deletions
diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh deleted file mode 100644 index 8d5d6908f045..000000000000 --- a/pkgs/development/libraries/glibc/builder.sh +++ /dev/null @@ -1,68 +0,0 @@ -# glibc cannot have itself in its rpath. -export NIX_NO_SELF_RPATH=1 -export NIX_DONT_SET_RPATH=1 - -source $stdenv/setup - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - - -postUnpack=postUnpack -postUnpack() { - cd $sourceRoot - unpackFile $linuxthreadsSrc - cd .. -} - - -preConfigure=preConfigure -preConfigure() { - - # Use Linuxthreads instead of NPTL. - rm -rf nptl - - for i in configure io/ftwtest-sh; do - substituteInPlace "$i" \ - --replace "@PWD@" "pwd" - done - - mkdir ../build - cd ../build - - configureScript=../$sourceRoot/configure -} - - -postConfigure=postConfigure -postConfigure() { - # Hack: get rid of the `-static' flag set by the bootstrap stdenv. - # This has to be done *after* `configure' because it builds some - # test binaries. - export NIX_CFLAGS_LINK= - export NIX_LDFLAGS_BEFORE= -} - - -postInstall=postInstall -postInstall() { - if test -n "$installLocales"; then - make localedata/install-locales - fi - rm $out/etc/ld.so.cache - (cd $out/include && ln -s $kernelHeaders/include/* .) || exit 1 - - # Workaround for the wrong <semaphore.h> getting installed. This - # appears to be a regression: - # http://www.mail-archive.com/debian-glibc@lists.debian.org/msg31543.html - cp ../$sourceRoot/linuxthreads/semaphore.h $out/include - - # Fix for NIXOS-54 (ldd not working on x86_64). Make a symlink - # "lib64" to "lib". - if test -n "$is64bit"; then - ln -s lib $out/lib64 - fi -} - - -genericBuild diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix deleted file mode 100644 index e4720cf56d52..000000000000 --- a/pkgs/development/libraries/glibc/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, kernelHeaders -, installLocales ? true -, profilingLibraries ? false -}: - -stdenv.mkDerivation { - name = "glibc-2.5"; - builder = ./builder.sh; - - src = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-2.5.tar.bz2; - md5 = "1fb29764a6a650a4d5b409dda227ac9f"; - }; - - linuxthreadsSrc = fetchurl { - url = http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-2.5.tar.bz2; - md5 = "870d76d46dcaba37c13d01dca47d1774"; - }; - - patches = [ ./glibc-pwd.patch ./glibc-getcwd-param-MAX.patch ]; - - inherit kernelHeaders installLocales; - - inherit (stdenv) is64bit; - - # `--with-tls --without-__thread' enables support for TLS but causes - # it not to be used. Required if we don't want to barf on 2.4 - # kernels. Or something. - configureFlags="--enable-add-ons - --with-headers=${kernelHeaders}/include - --with-tls --without-__thread --disable-sanity-checks - ${if profilingLibraries then "--enable-profile" else "--disable-profile"}"; -} diff --git a/pkgs/development/libraries/glibc/glibc-getcwd-param-MAX.patch b/pkgs/development/libraries/glibc/glibc-getcwd-param-MAX.patch deleted file mode 100644 index 8543dbbf1d76..000000000000 --- a/pkgs/development/libraries/glibc/glibc-getcwd-param-MAX.patch +++ /dev/null @@ -1,14 +0,0 @@ -2006-06-18 Mike Frysinger <vapier@gentoo.org> - - * sysdeps/unix/sysv/linux/getcwd.c: Include sys/param.h. - ---- glibc-old/sysdeps/unix/sysv/linux/getcwd.c -+++ glibc-new/sysdeps/unix/sysv/linux/getcwd.c -@@ -24,6 +24,7 @@ - #include <limits.h> - #include <stdlib.h> - #include <unistd.h> -+#include <sys/param.h> - - #include <sysdep.h> - #include <sys/syscall.h> diff --git a/pkgs/development/libraries/glibc/glibc-pwd.patch b/pkgs/development/libraries/glibc/glibc-pwd.patch deleted file mode 100644 index 07039718477f..000000000000 --- a/pkgs/development/libraries/glibc/glibc-pwd.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -ruN glibc-20050110/configure glibc-20050110.patched/configure ---- glibc-20050110/configure 2005-01-05 10:39:53.000000000 +0100 -+++ glibc-20050110.patched/configure 2005-01-18 13:33:01.000000000 +0100 -@@ -1393,7 +1393,7 @@ - ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - - --if test "`cd $srcdir; /bin/pwd`" = "`/bin/pwd`"; then -+if test "`cd $srcdir; @PWD@`" = "`@PWD@`"; then - { { echo "$as_me:$LINENO: error: you must configure in a separate build directory" >&5 - echo "$as_me: error: you must configure in a separate build directory" >&2;} - { (exit 1); exit 1; }; } -diff -ruN glibc-20050110/io/ftwtest-sh glibc-20050110.patched/io/ftwtest-sh ---- glibc-20050110/io/ftwtest-sh 2004-02-09 21:12:23.000000000 +0100 -+++ glibc-20050110.patched/io/ftwtest-sh 2005-01-18 13:33:15.000000000 +0100 -@@ -120,7 +120,7 @@ - sort > $testout - - # perhaps $tmp involves some symlinks... --tmpreal=`cd $tmp; /bin/pwd 2>/dev/null || /usr/bin/pwd` -+tmpreal=`cd $tmp; @PWD@ 2>/dev/null || /usr/bin/pwd` - - cat <<EOF | cmp $testout - || exit 1 - base = "$tmp/", file = "ftwtest.d", flag = FTW_D, cwd = $tmpreal, level = 0 -@@ -138,7 +138,7 @@ - EOF - rm $testout - --curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd` -+curwd=`@PWD@ 2>/dev/null || /usr/bin/pwd` - cd "$tmp" - LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d | - sort > $testout -@@ -160,7 +160,7 @@ - EOF - rm $testout - --curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd` -+curwd=`@PWD@ 2>/dev/null || /usr/bin/pwd` - cd "$tmp" - LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d/. | - sort > $testout -@@ -182,7 +182,7 @@ - EOF - rm $testout - --curwd=`/bin/pwd 2>/dev/null || /usr/bin/pwd` -+curwd=`@PWD@ 2>/dev/null || /usr/bin/pwd` - cd "$tmp" - LD_LIBRARY_PATH=$objpfx $ldso $testprogram --chdir ftwtest.d/foo/lvl1/link@1 | - sort > $testout -diff -ruN glibc-20050110/scripts/rellns-sh glibc-20050110.patched/scripts/rellns-sh ---- glibc-20050110/scripts/rellns-sh 1999-12-19 00:40:25.000000000 +0100 -+++ glibc-20050110.patched/scripts/rellns-sh 2005-01-18 13:35:53.245937423 +0100 -@@ -22,13 +22,13 @@ - exit 1 - fi - --if test -x /bin/pwd; then -- pwd=/bin/pwd --elif test -x /usr/bin/pwd; then -- pwd=/usr/bin/pwd --else -+#if test -x /bin/pwd; then -+# pwd=/bin/pwd -+#elif test -x /usr/bin/pwd; then -+# pwd=/usr/bin/pwd -+#else - pwd='pwd' --fi -+#fi - - # Make both paths absolute. - if test -d $1; then |