diff --git a/pkgs/development/libraries/glibc-new/builder.sh b/pkgs/development/libraries/glibc-new/builder.sh index 177e8482c90..9d34bda23bf 100644 --- a/pkgs/development/libraries/glibc-new/builder.sh +++ b/pkgs/development/libraries/glibc-new/builder.sh @@ -35,16 +35,6 @@ preConfigure() { } -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 diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh deleted file mode 100644 index 1c10baed503..00000000000 --- a/pkgs/development/libraries/glibc/builder.sh +++ /dev/null @@ -1,70 +0,0 @@ -# glibc cannot have itself in its rpath. -export NIX_NO_SELF_RPATH=1 -export NIX_DONT_SET_RPATH=1 - -source $stdenv/setup -source $substitute - -#glibc=`cat $NIX_GCC/nix-support/orig-glibc` -#echo $glibc - -#export LD_LIBRARY_PATH=$glibc/lib - -# Explicitly tell glibc to use our pwd, not /bin/pwd. -export PWD_P=$(type -tP pwd) - - -postUnpack=postUnpack -postUnpack() { - cd $sourceRoot - unpackFile $linuxthreadsSrc - rm -rf nptl - 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 - # `--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" -} - - -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 -} - - -genericBuild diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix deleted file mode 100644 index 96dd1b6c959..00000000000 --- a/pkgs/development/libraries/glibc/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{stdenv, fetchurl, kernelHeaders, installLocales ? true}: - -stdenv.mkDerivation { - name = "glibc-2.3.6"; - builder = ./builder.sh; - substitute = ../../../build-support/substitute/substitute.sh; - - src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/glibc-2.3.6.tar.bz2; - md5 = "bfdce99f82d6dbcb64b7f11c05d6bc96"; - }; - - linuxthreadsSrc = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/glibc-linuxthreads-2.3.6.tar.bz2; - md5 = "d4eeda37472666a15cc1f407e9c987a9"; - }; - - patches = [ ./glibc-pwd.patch ]; - - inherit kernelHeaders installLocales; -} diff --git a/pkgs/development/libraries/glibc/glibc-pwd.patch b/pkgs/development/libraries/glibc/glibc-pwd.patch deleted file mode 100644 index 07039718477..00000000000 --- 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 </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 diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 32d0fc207b5..e7e68716d62 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -100,7 +100,6 @@ rec { import ../generic { name = "stdenv-linux-boot"; - param1 = if staticGlibc then "static" else "dynamic"; preHook = ./scripts/prehook.sh; stdenv = stdenvInitial; shell = bootstrapTools.bash; diff --git a/pkgs/stdenv/linux/scripts/prehook.sh b/pkgs/stdenv/linux/scripts/prehook.sh index 4ba81f1eef7..29c02e2eaf2 100644 --- a/pkgs/stdenv/linux/scripts/prehook.sh +++ b/pkgs/stdenv/linux/scripts/prehook.sh @@ -1,8 +1,3 @@ export NIX_ENFORCE_PURITY=1 -if test "$param1" = "static"; then - export NIX_CFLAGS_LINK="-static" - export NIX_LDFLAGS_BEFORE="-static" -fi - havePatchELF=1