diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-07-13 09:07:54 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-07-13 09:07:54 +0000 |
| commit | 6f8e9bc2f6629a9bca09326ade6207e285db48e9 (patch) | |
| tree | 6c6daf929fbeb5e3c341febd25cc1edbd0d46937 | |
| parent | a85877edaf9c9bc0b7721fd353d77629f9dc5867 (diff) | |
| download | nixlib-6f8e9bc2f6629a9bca09326ade6207e285db48e9.tar nixlib-6f8e9bc2f6629a9bca09326ade6207e285db48e9.tar.gz nixlib-6f8e9bc2f6629a9bca09326ade6207e285db48e9.tar.bz2 nixlib-6f8e9bc2f6629a9bca09326ade6207e285db48e9.tar.lz nixlib-6f8e9bc2f6629a9bca09326ade6207e285db48e9.tar.xz nixlib-6f8e9bc2f6629a9bca09326ade6207e285db48e9.tar.zst nixlib-6f8e9bc2f6629a9bca09326ade6207e285db48e9.zip | |
* Make the grep call optional.
svn path=/nixpkgs/trunk/; revision=3330
| -rw-r--r-- | maintainers/docs/todo.txt | 5 | ||||
| -rw-r--r-- | pkgs/build-support/gcc-wrapper/gcc-wrapper.sh | 10 | ||||
| -rw-r--r-- | pkgs/stdenv/freebsd/prehook.sh | 5 |
3 files changed, 14 insertions, 6 deletions
diff --git a/maintainers/docs/todo.txt b/maintainers/docs/todo.txt index c63a40d85bc6..7c4a0150942a 100644 --- a/maintainers/docs/todo.txt +++ b/maintainers/docs/todo.txt @@ -1,5 +1,3 @@ -* Bump freetype to 2.1.7 (but it breaks Pango 1.2.5). - * Patch development/tools/misc/libtool not to search standard directories for libraries (like setup.sh does now). [do we want this?] @@ -10,3 +8,6 @@ * After building gcc, filter out references to /tmp/nix... in .../lib/libsupc++.la and .../lib/libstdc++.la + +* In libxml2: python2.3 -> python2.4 (or even better, make this + generic; also in bittorrent). diff --git a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh index 4db12afb5ce8..7de57afc3f81 100644 --- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh @@ -116,6 +116,10 @@ fi # Call the real `gcc'. Filter out warnings from stderr about unused # `-B' flags, since they confuse some programs. Deep bash magic to # apply grep to stderr (by swapping stdin/stderr twice). -(@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ - | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- -exit $? +if test -z "$NIX_GCC_NEEDS_GREP"; then + @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} +else + (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ + | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- + exit $? +fi diff --git a/pkgs/stdenv/freebsd/prehook.sh b/pkgs/stdenv/freebsd/prehook.sh index 5dcc55fdf077..a82f5d21dfce 100644 --- a/pkgs/stdenv/freebsd/prehook.sh +++ b/pkgs/stdenv/freebsd/prehook.sh @@ -1,4 +1,7 @@ export NIX_ENFORCE_PURITY= alias make=gmake export MAKE=gmake -shopt -s expand_aliases \ No newline at end of file +shopt -s expand_aliases + +# Filter out stupid GCC warnings (in gcc-wrapper). +export NIX_GCC_NEEDS_GREP=1 |