public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Only print "@ phase..." messages on demand since they're kind of

Browse Source 
ugly and we already print phases (with start and end markers).
* Remove some stray tabs.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30059
This commit is contained in:
Eelco Dolstra 2011-10-27 16:32:46 +00:00
parent de1c91bc00
commit fd394a7c4a
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/stdenv/generic/setup.sh
View File

@ -453,8 +453,8 @@ unpackFile() {
case "$curSrc" in case "$curSrc" in
*.tar | *.tar.* | *.tgz | *.tbz2) *.tar | *.tar.* | *.tgz | *.tbz2)
# GNU tar can automatically select the decompression method # GNU tar can automatically select the decompression method
# (info "(tar) gzip"). # (info "(tar) gzip").
tar xvf $curSrc tar xvf $curSrc
;; ;;
*.zip) *.zip)
@ -834,9 +834,11 @@ genericBuild() {
if test "$curPhase" = installPhase -a -n "$dontInstall"; then continue; fi if test "$curPhase" = installPhase -a -n "$dontInstall"; then continue; fi
if test "$curPhase" = fixupPhase -a -n "$dontFixup"; then continue; fi if test "$curPhase" = fixupPhase -a -n "$dontFixup"; then continue; fi
if test "$curPhase" = distPhase -a -z "$doDist"; then continue; fi if test "$curPhase" = distPhase -a -z "$doDist"; then continue; fi
echo if [ -n "$tracePhases" ]; then
echo "@ phase-started $out $curPhase" echo
echo "@ phase-started $out $curPhase"
fi
showPhaseHeader "$curPhase" showPhaseHeader "$curPhase"
dumpVars dumpVars
@ -849,8 +851,10 @@ genericBuild() {
cd "${sourceRoot:-.}" cd "${sourceRoot:-.}"
fi fi
echo if [ -n "$tracePhases" ]; then
echo "@ phase-succeeded $out $curPhase" echo
echo "@ phase-succeeded $out $curPhase"
fi
stopNest stopNest
done done