movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-12 05:16:25 +03:00
Code Activity

* Upgrade to gcc 3.3.3. Starting at 3.3.3, the gcc makefile checks

Browse source 
whether the system header file directory actually exists (when
  calling fixinc), so passing a non-existent directory no longer
  works.  Instead we make a empty dummy directory.

svn path=/nixpkgs/trunk/; revision=858
This commit is contained in:
Eelco Dolstra 2004-03-27 16:35:59 +00:00
parent 9c4cfc02ce
commit 8c4a80b585
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/compilers/gcc/builder.sh
View file

@ -3,6 +3,10 @@
. $stdenv/setup . $stdenv/setup
FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
mkdir $FIXINC_DUMMY
preConfigure() { preConfigure() {
if test "$noSysDirs" = "1"; then if test "$noSysDirs" = "1"; then
@ -60,7 +64,7 @@ postConfigure() {
# header files from /usr/include. # header files from /usr/include.
mf=gcc/Makefile mf=gcc/Makefile
sed \ sed \
-e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = /fixinc-disabled^" \ -e "s^NATIVE_SYSTEM_HEADER_DIR =\(.*\)^NATIVE_SYSTEM_HEADER_DIR = $FIXINC_DUMMY^" \
< $mf > $mf.tmp < $mf > $mf.tmp
mv $mf.tmp $mf mv $mf.tmp $mf
fi fi

10
pkgs/development/compilers/gcc/default.nix
View file

@ -5,16 +5,12 @@
assert langC; assert langC;
derivation { derivation {
name = "gcc-3.3.2"; name = "gcc-3.3.3";
system = stdenv.system; system = stdenv.system;
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-3.3.2/gcc-3.3.2.tar.bz2; url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.3.3/gcc-3.3.3.tar.bz2;
md5 = "65999f654102f5438ac8562d13a6eced"; md5 = "3c6cfd9fcd180481063b4058cf6faff2";
}; };
# src = fetchurl {
# url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-3.3.3/gcc-3.3.3.tar.bz2;
# md5 = "3c6cfd9fcd180481063b4058cf6faff2";
# };
inherit stdenv noSysDirs langC langCC langF77; inherit stdenv noSysDirs langC langCC langF77;
} }