* The stdenv setup script now defines a generic builder that allows

builders for typical Autoconf-style to be much shorten, e.g.,

    . $stdenv/setup
    genericBuild

  The generic builder does lots of stuff automatically:

  - Unpacks source archives specified by $src or $srcs (it knows about
    gzip, bzip2, tar, zip, and unpacked source trees).
  - Determines the source tree.
  - Applies patches specified by $patches.
  - Fixes libtool not to search for libraries in /lib etc.
  - Runs `configure'.
  - Runs `make'.
  - Runs `make install'.
  - Strips debug information from static libraries.
  - Writes nested log information (in the format accepted by
    `log2xml').

  There are also lots of hooks and variables to customise the generic
  builder.  See `stdenv/generic/docs.txt'.

* Adapted the base packages (i.e., the ones used by stdenv) to use the
  generic builder.

* We now use `curl' instead of `wget' to download files in `fetchurl'.

* Neither `curl' nor `wget' are part of stdenv.  We shouldn't
  encourage people to download stuff in builders (impure!).

* Updated some packages.

* `buildinputs' is now `buildInputs' (but the old name also works).

* `findInputs' in the setup script now prevents inputs from being
  processed multiple times (which could happen, e.g., if an input was
  a propagated input of several other inputs; this caused the size
  variables like $PATH to blow up exponentially in the worst case).

* Patched GNU Make to write nested log information in the format
  accepted by `log2xml'.  Also, prior to writing the build command,
  Make now writes a line `building X' to indicate what is being
  built.  This is unfortunately often obscured by the gigantic tool
  invocations in many Makefiles.  The actual build commands are marked
  `unimportant' so that they don't clutter pages generated by
  `log2html'.


svn path=/nixpkgs/trunk/; revision=845

pkgs/development/compilers/gcc/builder.sh

@@ -1,65 +1,74 @@
 #! /bin/sh -e
 
-buildinputs="$binutils"
 . $stdenv/setup
 
-tar xvfj $src
 
-if test "$noSysDirs" = "1"; then
-    # Disable the standard include directories.
-    cd gcc-*
-    cat >> ./gcc/cppdefault.h <<EOF
+preConfigure() {
+    
+    if test "$noSysDirs" = "1"; then
+        # Disable the standard include directories.
+        cat >> ./gcc/cppdefault.h <<EOF
 #undef LOCAL_INCLUDE_DIR
 #undef SYSTEM_INCLUDE_DIR
 #undef STANDARD_INCLUDE_DIR
 EOF
-    cd ..
-fi
+    fi
 
-langs="c"
-if test -n "$langCC"; then
-    langs="$langs,c++"
-fi
-if test -n "$langF77"; then
-    langs="$langs,f77"
-fi
+    # Determine the frontends to build.
+    langs="c"
+    if test -n "$langCC"; then
+        langs="$langs,c++"
+    fi
+    if test -n "$langF77"; then
+        langs="$langs,f77"
+    fi
 
-# Configure.
-mkdir build
-cd build
-../gcc-*/configure --prefix=$out --enable-languages="$langs"
+    # Perform the build in a different directory.
+    mkdir ../build
+    cd ../build
 
-if test "$noSysDirs" = "1"; then
-    # Patch some of the makefiles to force linking against our own glibc.
-    . $NIX_GCC/nix-support/add-flags # add glibc/gcc flags
-    extraflags="-Wl,-s $NIX_CFLAGS_COMPILE $NIX_CFLAGS_LINK"
-    for i in $NIX_LDFLAGS; do
-        extraflags="$extraflags -Wl,$i"
-    done
+    configureScript=../$sourceRoot/configure
+    configureFlags="--enable-languages=$langs"
+}
 
-    mf=Makefile
-    sed \
-        -e "s^FLAGS_FOR_TARGET =\(.*\)^FLAGS_FOR_TARGET = \1 $extraflags^" \
-        < $mf > $mf.tmp
-    mv $mf.tmp $mf
+preConfigure=preConfigure
 
-    mf=gcc/Makefile
-    sed \
-        -e "s^X_CFLAGS =\(.*\)^X_CFLAGS = \1 $extraflags^" \
-        < $mf > $mf.tmp
-    mv $mf.tmp $mf
 
-    # Patch gcc/Makefile to prevent fixinc.sh from "fixing" system header files
-    # from /usr/include.
-    mf=gcc/Makefile
-    sed \
-        -e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = /fixinc-disabled^" \
-        < $mf > $mf.tmp
-    mv $mf.tmp $mf
-fi
+postConfigure() {
+    if test "$noSysDirs" = "1"; then
+        # Patch some of the makefiles to force linking against our own
+        # glibc.
+        . $NIX_GCC/nix-support/add-flags # add glibc/gcc flags
+        extraflags="-Wl,-s $NIX_CFLAGS_COMPILE $NIX_CFLAGS_LINK"
+        for i in $NIX_LDFLAGS; do
+            extraflags="$extraflags -Wl,$i"
+        done
 
-# Build and install.
-make bootstrap
-make install
+        mf=Makefile
+        sed \
+            -e "s^FLAGS_FOR_TARGET =\(.*\)^FLAGS_FOR_TARGET = \1 $extraflags^" \
+            < $mf > $mf.tmp
+        mv $mf.tmp $mf
 
-find $out -name "*.a" -exec strip -S {} \;
+        mf=gcc/Makefile
+        sed \
+            -e "s^X_CFLAGS =\(.*\)^X_CFLAGS = \1 $extraflags^" \
+            < $mf > $mf.tmp
+        mv $mf.tmp $mf
+
+        # Patch gcc/Makefile to prevent fixinc.sh from "fixing" system
+        # header files from /usr/include.
+        mf=gcc/Makefile
+        sed \
+            -e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = /fixinc-disabled^" \
+            < $mf > $mf.tmp
+        mv $mf.tmp $mf
+    fi
+}
+
+postConfigure=postConfigure
+
+
+makeFlags="bootstrap"
+
+genericBuild