Author: ludo
Date: Wed Sep 15 15:55:12 2010
New Revision: 23809
URL: https://svn.nixos.org/websvn/nix/?rev=23809&sc=1
Log:
glibc: Revert switch to the `buildOutOfSourceTree' option.
The glibc build system expects out-of-source-tree builds but requires
write access to the source tree, for `libc-texinfo.sh'.
Reverting "glibc: Fix the `tarball' job."
Reverting "glibc: Use the new `buildOutOfSourceTree' option."
Modified:
hydra-config/gnu/trunk/glibc/release.nix
Modified: hydra-config/gnu/trunk/glibc/release.nix
==============================================================================
--- hydra-config/gnu/trunk/glibc/release.nix Wed Sep 15 12:57:49 2010
(r23808)
+++ hydra-config/gnu/trunk/glibc/release.nix Wed Sep 15 15:55:12 2010
(r23809)
@@ -45,7 +45,13 @@
# Build out-of-tree; don't produce self rpaths.
preConfigure =
- '' set -x
+ ''
+ set -x
+
+ mkdir ../build
+ cd ../build
+
+ configureScript="../$sourceRoot/configure"
# Glibc cannot have itself in its RPATH.
# See http://sourceware.org/ml/binutils/2009-03/msg00066.html .
@@ -121,7 +127,6 @@
];
buildNativeInputs = (buildInputsFrom pkgs) ++ extraBuildInputs;
- buildOutOfSourceTree = true;
doCheck = false;
inherit propagatedBuildNativeInputs CPATH preConfigure meta;
}).hostDrv;
@@ -150,17 +155,15 @@
autoconfPhase = "true";
bootstrapBuildInputs = [];
- # Remove absolute paths from `configure' & co; build out of source
- # tree.
+ # Remove absolute paths from `configure' & co.; build out-of-tree.
preConfigure =
- '' set -x
+ ''
+ set -x
for i in configure io/ftwtest-sh; do
sed -i "$i" -e "s^/bin/pwd^pwd^g"
done
- mkdir ../build
- cd ../build
- configureScript="../$sourceRoot/configure"
+ ${preConfigure}
'';
buildInputs = (buildInputsFrom pkgs) ++ [ pkgs.git pkgs.xz ];
@@ -209,7 +212,6 @@
# install".
checkPhase = "make -k check || true";
- buildOutOfSourceTree = true;
inherit preConfigure meta;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
