diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-04-22 12:14:55 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-04-22 12:14:55 +0000 |
commit | 2ed47f7522c4bcdade3ac803b7e93218e7225ac4 (patch) | |
tree | 3ec0f36d76330314378461430d41e33229dad7f5 | |
parent | 09cea66748b9f50356bb18b9818c8298922c8b59 (diff) |
* GCC 4.0.0 added (though it's not used for anything yet).
svn path=/nixpkgs/trunk/; revision=2878
-rw-r--r-- | maintainers/docs/bugs.txt | 3 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc-4.0/builder.sh | 88 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc-4.0/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc-4.0/no-sys-dirs.patch | 228 | ||||
-rw-r--r-- | pkgs/system/all-packages-generic.nix | 13 |
5 files changed, 350 insertions, 0 deletions
diff --git a/maintainers/docs/bugs.txt b/maintainers/docs/bugs.txt index b909ab9ecf0ae..ed11f65740393 100644 --- a/maintainers/docs/bugs.txt +++ b/maintainers/docs/bugs.txt @@ -53,3 +53,6 @@ include/X11/IntrinsicP.h:202:25: X11/ObjectP.h: No such file or directory * In gtksourceview-sharp: does the prefix patch cause problems (e.g., makefile.am says "mimeinfodir should be the same as the gnome prefix")? + + +* fgrep/egrep: these fail if grep is not in the $PATH. diff --git a/pkgs/development/compilers/gcc-4.0/builder.sh b/pkgs/development/compilers/gcc-4.0/builder.sh new file mode 100644 index 0000000000000..30498afe241d9 --- /dev/null +++ b/pkgs/development/compilers/gcc-4.0/builder.sh @@ -0,0 +1,88 @@ +. $stdenv/setup + + +export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy +mkdir $NIX_FIXINC_DUMMY + + +if test "$noSysDirs" = "1"; then + + if test "$noSysDirs" = "1"; then + # Figure out what extra flags to pass to the gcc compilers + # being generated to make sure that they use our glibc. + 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. + extraCFlags="-B$glibc/lib -isystem $glibc/include" + extraLDFlags="-B$glibc/lib -L$glibc/lib -Wl,-s \ + -Wl,-dynamic-linker,$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 + + export NIX_EXTRA_CFLAGS=$extraCFlags + export NIX_EXTRA_LDFLAGS=$extraLDFlags + export CFLAGS=$extraCFlags + export CXXFLAGS=$extraCFlags + export LDFLAGS=$extraLDFlags + fi + +else + patches="" +fi + + +preConfigure=preConfigure +preConfigure() { + + # 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" +} + + +postInstall=postInstall +postInstall() { + # Remove precompiled headers for now. They are very big and + # probably not very useful yet. + find $out/include -name "*.gch" -exec rm -rf {} \; -prune + + # Remove `fixincl' to prevent a retained dependency on the + # previous gcc. + rm -rf $out/libexec/gcc/*/*/install-tools +} + + +if test -z "$profiledCompiler"; then + makeFlags="bootstrap" +else + makeFlags="profiledbootstrap" +fi + +genericBuild diff --git a/pkgs/development/compilers/gcc-4.0/default.nix b/pkgs/development/compilers/gcc-4.0/default.nix new file mode 100644 index 0000000000000..e7b9d27a86799 --- /dev/null +++ b/pkgs/development/compilers/gcc-4.0/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, noSysDirs +, langC ? true, langCC ? true, langF77 ? false +, profiledCompiler ? false +}: + +assert langC; + +stdenv.mkDerivation { + name = "gcc-4.0.0"; + builder = ./builder.sh; + src = fetchurl { + url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-4.0.0/gcc-4.0.0.tar.bz2; + md5 = "55ee7df1b29f719138ec063c57b89db6"; + }; + # !!! apply only if noSysDirs is set + patches = [./no-sys-dirs.patch]; + inherit noSysDirs langC langCC langF77 profiledCompiler; +} diff --git a/pkgs/development/compilers/gcc-4.0/no-sys-dirs.patch b/pkgs/development/compilers/gcc-4.0/no-sys-dirs.patch new file mode 100644 index 0000000000000..74ef6056b1fd6 --- /dev/null +++ b/pkgs/development/compilers/gcc-4.0/no-sys-dirs.patch @@ -0,0 +1,228 @@ +diff -rc gcc-4.0.0-orig/gcc/cppdefault.c gcc-4.0.0/gcc/cppdefault.c +*** gcc-4.0.0-orig/gcc/cppdefault.c 2004-11-03 04:23:49.000000000 +0100 +--- gcc-4.0.0/gcc/cppdefault.c 2005-04-22 09:53:28.000000000 +0200 +*************** +*** 41,46 **** +--- 41,50 ---- + # undef CROSS_INCLUDE_DIR + #endif + ++ #undef LOCAL_INCLUDE_DIR ++ #undef SYSTEM_INCLUDE_DIR ++ #undef STANDARD_INCLUDE_DIR ++ + const struct default_include cpp_include_defaults[] + #ifdef INCLUDE_DEFAULTS + = INCLUDE_DEFAULTS; +diff -rc gcc-4.0.0-orig/gcc/Makefile.in gcc-4.0.0/gcc/Makefile.in +*** gcc-4.0.0-orig/gcc/Makefile.in 2005-04-04 21:45:13.000000000 +0200 +--- gcc-4.0.0/gcc/Makefile.in 2005-04-22 10:38:50.000000000 +0200 +*************** +*** 213,219 **** + CPPFLAGS = @CPPFLAGS@ + + # These exists to be overridden by the x-* and t-* files, respectively. +! X_CFLAGS = + T_CFLAGS = + + X_CPPFLAGS = +--- 213,219 ---- + CPPFLAGS = @CPPFLAGS@ + + # These exists to be overridden by the x-* and t-* files, respectively. +! X_CFLAGS = $(NIX_EXTRA_CFLAGS) $(NIX_EXTRA_LDFLAGS) + T_CFLAGS = + + X_CPPFLAGS = +*************** +*** 373,379 **** + MD5_H = $(srcdir)/../include/md5.h + + # Default native SYSTEM_HEADER_DIR, to be overridden by targets. +! NATIVE_SYSTEM_HEADER_DIR = /usr/include + # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. + CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ + +--- 373,383 ---- + MD5_H = $(srcdir)/../include/md5.h + + # Default native SYSTEM_HEADER_DIR, to be overridden by targets. +! # Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent +! # `fixinc' from fixing header files in /usr/include. However, +! # NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set +! # it to some dummy directory. +! NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY) + # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. + CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ + +*************** +*** 385,391 **** + STMP_FIXINC = @STMP_FIXINC@ + + # Test to see whether <limits.h> exists in the system header files. +! LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ] + + # Directory for prefix to system directories, for + # each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc. +--- 389,395 ---- + STMP_FIXINC = @STMP_FIXINC@ + + # Test to see whether <limits.h> exists in the system header files. +! LIMITS_H_TEST = true + + # Directory for prefix to system directories, for + # each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc. +*************** +*** 2677,2683 **** + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ + -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ + -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ +! -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ + -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ + -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ + @TARGET_SYSTEM_ROOT_DEFINE@ +--- 2681,2687 ---- + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ + -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ + -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ +! -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ + -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ + -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ + @TARGET_SYSTEM_ROOT_DEFINE@ +Only in gcc-4.0.0/gcc: Makefile.in~ +diff -rc gcc-4.0.0-orig/libstdc++-v3/include/Makefile.in gcc-4.0.0/libstdc++-v3/include/Makefile.in +*** gcc-4.0.0-orig/libstdc++-v3/include/Makefile.in 2005-04-01 06:24:31.000000000 +0200 +--- gcc-4.0.0/libstdc++-v3/include/Makefile.in 2005-04-22 09:54:27.000000000 +0200 +*************** +*** 959,966 **** + if [ ! -d "${pch_output_builddir}" ]; then \ + mkdir -p ${pch_output_builddir}; \ + fi; \ +! $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g.gch; \ +! $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g.gch; + + # For robustness sake (in light of junk files or in-source + # configuration), copy from the build or source tree to the install +--- 959,966 ---- + if [ ! -d "${pch_output_builddir}" ]; then \ + mkdir -p ${pch_output_builddir}; \ + fi; \ +! $(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g.gch; \ +! $(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g.gch; + + # For robustness sake (in light of junk files or in-source + # configuration), copy from the build or source tree to the install +Only in gcc-4.0.0/libstdc++-v3/include: Makefile.in~ +Only in gcc-4.0.0/libstdc++-v3/include: Makefile.in.orig +Only in gcc-4.0.0/libstdc++-v3/include: Makefile.in.rej +diff -rc gcc-4.0.0-orig/ltcf-cxx.sh gcc-4.0.0/ltcf-cxx.sh +*** gcc-4.0.0-orig/ltcf-cxx.sh 2004-10-02 18:33:06.000000000 +0200 +--- gcc-4.0.0/ltcf-cxx.sh 2005-04-22 09:53:28.000000000 +0200 +*************** +*** 988,994 **** + # the conftest object file. + pre_test_object_deps_done=no + +! for p in `eval $output_verbose_link_cmd`; do + + case $p in + +--- 988,994 ---- + # the conftest object file. + pre_test_object_deps_done=no + +! for p in `true`; do + + case $p in + +Only in gcc-4.0.0: ltcf-cxx.sh.orig +diff -rc gcc-4.0.0-orig/ltconfig gcc-4.0.0/ltconfig +*** gcc-4.0.0-orig/ltconfig 2004-10-02 18:33:06.000000000 +0200 +--- gcc-4.0.0/ltconfig 2005-04-22 13:33:33.000000000 +0200 +*************** +*** 2321,2326 **** +--- 2321,2331 ---- + # A language-specific compiler. + CC=$CC + ++ # Ugly hack to get libmudflap (and possibly other libraries) to build. ++ # Libtool filters out \`-B' flags when linking (why?), so the \`-B' flag ++ # to Glibc gets lost. Here we forcibly add it to any invocation. ++ CC="\$CC $NIX_EXTRA_LDFLAGS" ++ + # Is the compiler the GNU C compiler? + with_gcc=$with_gcc + +Only in gcc-4.0.0: ltconfig~ +diff -rc gcc-4.0.0-orig/Makefile.in gcc-4.0.0/Makefile.in +*** gcc-4.0.0-orig/Makefile.in 2005-04-21 09:04:10.000000000 +0200 +--- gcc-4.0.0/Makefile.in 2005-04-22 09:53:28.000000000 +0200 +*************** +*** 336,342 **** + NM = @NM@ + + LD = @LD@ +! LDFLAGS = + + RANLIB = @RANLIB@ + +--- 336,342 ---- + NM = @NM@ + + LD = @LD@ +! LDFLAGS = $(NIX_EXTRA_LDFLAGS) + + RANLIB = @RANLIB@ + +*************** +*** 387,393 **** + # CFLAGS will be just -g. We want to ensure that TARGET libraries + # (which we know are built with gcc) are built with optimizations so + # prepend -O2 when setting CFLAGS_FOR_TARGET. +! CFLAGS_FOR_TARGET = -O2 $(CFLAGS) + # If GCC_FOR_TARGET is not overriden on the command line, then this + # variable is passed down to the gcc Makefile, where it is used to + # build libgcc2.a. We define it here so that it can itself be +--- 387,393 ---- + # CFLAGS will be just -g. We want to ensure that TARGET libraries + # (which we know are built with gcc) are built with optimizations so + # prepend -O2 when setting CFLAGS_FOR_TARGET. +! CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(NIX_EXTRA_CFLAGS) + # If GCC_FOR_TARGET is not overriden on the command line, then this + # variable is passed down to the gcc Makefile, where it is used to + # build libgcc2.a. We define it here so that it can itself be +*************** +*** 400,406 **** + RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@ + CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@ + RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@ +! CXXFLAGS_FOR_TARGET = $(CXXFLAGS) + LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates + + DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ +--- 400,406 ---- + RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@ + CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@ + RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@ +! CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(NIX_EXTRA_CFLAGS) + LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates + + DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ +*************** +*** 434,440 **** + fi; \ + fi` + +! LDFLAGS_FOR_TARGET = + + NM_FOR_TARGET=@NM_FOR_TARGET@ + CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@ +--- 434,440 ---- + fi; \ + fi` + +! LDFLAGS_FOR_TARGET = $(NIX_EXTRA_LDFLAGS) + + NM_FOR_TARGET=@NM_FOR_TARGET@ + CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@ +Only in gcc-4.0.0: Makefile.in.orig diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 6ea3663e82828..f7b406d1acb7e 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -28,6 +28,8 @@ rec { inherit stdenv subversion nix; }; + substituter = ../build-support/substitute/substitute.sh; + ### TOOLS @@ -316,6 +318,17 @@ rec { inherit stdenv; }; + gcc40 = (import ../build-support/gcc-wrapper) { + nativeTools = false; + nativeGlibc = false; + gcc = (import ../development/compilers/gcc-4.0) { + inherit fetchurl stdenv noSysDirs; + profiledCompiler = true; + }; + inherit (stdenv.gcc) binutils glibc; + inherit stdenv; + }; + gcc295 = (import ../build-support/gcc-wrapper) { nativeTools = false; nativeGlibc = false; |