Author: ludo
Date: Fri Sep 10 23:03:52 2010
New Revision: 23734
URL: https://svn.nixos.org/websvn/nix/?rev=23734&sc=1
Log:
glibc: Fix the `tarball' job.
Modified:
hydra-config/gnu/trunk/glibc/release.nix
Modified: hydra-config/gnu/trunk/glibc/release.nix
==============================================================================
--- hydra-config/gnu/trunk/glibc/release.nix Fri Sep 10 18:03:16 2010
(r23733)
+++ hydra-config/gnu/trunk/glibc/release.nix Fri Sep 10 23:03:52 2010
(r23734)
@@ -150,15 +150,17 @@
autoconfPhase = "true";
bootstrapBuildInputs = [];
- # Remove absolute paths from `configure' & co.
+ # Remove absolute paths from `configure' & co; build out of source
+ # tree.
preConfigure =
- ''
- set -x
+ '' set -x
for i in configure io/ftwtest-sh; do
sed -i "$i" -e "s^/bin/pwd^pwd^g"
done
- ${preConfigure}
+ mkdir ../build
+ cd ../build
+ configureScript="../$sourceRoot/configure"
'';
buildInputs = (buildInputsFrom pkgs) ++ [ pkgs.git pkgs.xz ];
@@ -172,7 +174,6 @@
mv -v glibc-*.tar.{bz2,gz,xz} "$out/tarballs"
'';
- buildOutOfSourceTree = true;
inherit meta;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
