2004-03-05 11:13:23 +01:00
|
|
|
. $stdenv/setup
|
|
|
|
|
|
|
|
|
2004-03-27 17:35:59 +01:00
|
|
|
FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
|
|
|
|
mkdir $FIXINC_DUMMY
|
|
|
|
|
|
|
|
|
* 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
2004-03-19 17:53:04 +01:00
|
|
|
preConfigure() {
|
|
|
|
|
|
|
|
if test "$noSysDirs" = "1"; then
|
|
|
|
# Disable the standard include directories.
|
|
|
|
cat >> ./gcc/cppdefault.h <<EOF
|
2004-03-05 11:13:23 +01:00
|
|
|
#undef LOCAL_INCLUDE_DIR
|
|
|
|
#undef SYSTEM_INCLUDE_DIR
|
|
|
|
#undef STANDARD_INCLUDE_DIR
|
|
|
|
EOF
|
* 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
2004-03-19 17:53:04 +01:00
|
|
|
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
|
|
|
|
|
|
|
|
# Perform the build in a different directory.
|
|
|
|
mkdir ../build
|
|
|
|
cd ../build
|
|
|
|
|
|
|
|
configureScript=../$sourceRoot/configure
|
|
|
|
configureFlags="--enable-languages=$langs"
|
|
|
|
}
|
|
|
|
|
|
|
|
preConfigure=preConfigure
|
|
|
|
|
|
|
|
|
|
|
|
postConfigure() {
|
|
|
|
if test "$noSysDirs" = "1"; then
|
|
|
|
# Patch some of the makefiles to force linking against our own
|
|
|
|
# glibc.
|
2004-04-05 00:02:41 +02:00
|
|
|
if test -e $NIX_GCC/nix-support/orig-glibc; then
|
|
|
|
glibc=$(cat $NIX_GCC/nix-support/orig-glibc)
|
|
|
|
# Ugh. Copied from gcc-wrapper/builder.sh. We can't just
|
|
|
|
# source in $NIX_GCC/nix-support/add-flags, since that
|
|
|
|
# would cause *this* GCC to be linked against the
|
|
|
|
# *previous* GCC. Need some more modularity there.
|
|
|
|
extraFlags="-Wl,-s -B$glibc/lib -isystem $glibc/include \
|
|
|
|
-L$glibc/lib -Wl,-dynamic-linker -Wl,$glibc/lib/ld-linux.so.2"
|
|
|
|
|
|
|
|
# Oh, what a hack. I should be shot for this.
|
|
|
|
# In stage 1, we should link against the previous GCC, but
|
|
|
|
# not afterwards. Otherwise we retain a dependency.
|
|
|
|
# However, ld-wrapper, which adds the linker flags for the
|
|
|
|
# previous GCC, is also used in stage 2/3. We can prevent
|
|
|
|
# it from adding them by NIX_GLIBC_FLAGS_SET, but then
|
|
|
|
# gcc-wrapper will also not add them, thereby causing
|
|
|
|
# stage 1 to fail. So we use a trick to only set the
|
|
|
|
# flags in gcc-wrapper.
|
|
|
|
hook=$(pwd)/ld-wrapper-hook
|
|
|
|
echo "NIX_GLIBC_FLAGS_SET=1" > $hook
|
|
|
|
export NIX_LD_WRAPPER_START_HOOK=$hook
|
|
|
|
fi
|
* 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
2004-03-19 17:53:04 +01:00
|
|
|
|
|
|
|
mf=Makefile
|
|
|
|
sed \
|
2004-04-05 00:02:41 +02:00
|
|
|
-e "s^FLAGS_FOR_TARGET =\(.*\)^FLAGS_FOR_TARGET = \1 $extraFlags^" \
|
* 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
2004-03-19 17:53:04 +01:00
|
|
|
< $mf > $mf.tmp
|
|
|
|
mv $mf.tmp $mf
|
|
|
|
|
|
|
|
mf=gcc/Makefile
|
|
|
|
sed \
|
2004-04-05 00:02:41 +02:00
|
|
|
-e "s^X_CFLAGS =\(.*\)^X_CFLAGS = \1 $extraFlags^" \
|
* 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
2004-03-19 17:53:04 +01:00
|
|
|
< $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 \
|
2004-03-27 17:35:59 +01:00
|
|
|
-e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = $FIXINC_DUMMY^" \
|
* 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
2004-03-19 17:53:04 +01:00
|
|
|
< $mf > $mf.tmp
|
|
|
|
mv $mf.tmp $mf
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
postConfigure=postConfigure
|
|
|
|
|
|
|
|
|
|
|
|
makeFlags="bootstrap"
|
|
|
|
|
|
|
|
genericBuild
|