diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2005-01-20 22:54:51 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2005-01-20 22:54:51 +0000 |
| commit | 8125cd8915a1601280327503ce3ac14e0a356771 (patch) | |
| tree | 0d9bf0cf217973bf5be18bfcfe5e3dc04bec89a1 | |
| parent | 4b1621120173056e0efbbf1528fab89803d16629 (diff) | |
everything to build glibc statically succesfully backups/nixos-pkgs@34170
svn path=/nixpkgs/branches/nixos-pkgs/; revision=2079
| -rw-r--r-- | pkgs/development/libraries/glibc/builder.sh | 10 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/subst.sh | 1 |
2 files changed, 2 insertions, 9 deletions
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 |