From 8125cd8915a1601280327503ce3ac14e0a356771 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Thu, 20 Jan 2005 22:54:51 +0000
Subject: everything to build glibc statically succesfully

svn path=/nixpkgs/branches/nixos-pkgs/; revision=2079
---
 pkgs/development/libraries/glibc/builder.sh | 10 +---------
 pkgs/development/libraries/glibc/subst.sh   |  1 +
 2 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'pkgs/development/libraries/glibc')

diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh
index a22429b2cb1ab..0ff9b058a8cc6 100644
--- a/pkgs/development/libraries/glibc/builder.sh
+++ b/pkgs/development/libraries/glibc/builder.sh
@@ -1,6 +1,6 @@
 # glibc cannot have itself in its rpath.
 export NIX_NO_SELF_RPATH=1
-export NIX_DEBUG=1
+#export NIX_DEBUG=1
 export NIX_DONT_SET_RPATH=1
 
 . $stdenv/setup
@@ -45,14 +45,6 @@ preConfigure() {
 
 preConfigure=preConfigure
 
-configurePhase() {
-   preConfigure
-   $SHELL $configureScript $configureFlags --prefix=$out
-}
-
-configurePhase=configurePhase
-
-
 postInstall() {
     if test -n "$installLocales"; then
         make localedata/install-locales
diff --git a/pkgs/development/libraries/glibc/subst.sh b/pkgs/development/libraries/glibc/subst.sh
index 4687e27a2cbe2..1db5c22123e5b 100644
--- a/pkgs/development/libraries/glibc/subst.sh
+++ b/pkgs/development/libraries/glibc/subst.sh
@@ -2,4 +2,5 @@ FILES="configure io/ftwtest-sh"
 for i in $FILES ; do
   sed  -e "s^@PWD@^pwd^g" < $i > $i.new
   mv $i.new $i
+  chmod +x $i
 done
-- 
cgit 1.4.1