From 2a804eb95b62828b1770a4e5c900783da5cf0144 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 May 2007 13:30:09 +0000 Subject: [PATCH] * Backported the gcc 4.2 patch to 4.1 * Update to gcc 4.1.2. * Removed some unnecessary stuff from the patch. svn path=/nixpkgs/trunk/; revision=8739 --- pkgs/development/compilers/gcc-4.1/builder.sh | 31 +- .../development/compilers/gcc-4.1/default.nix | 35 +- .../compilers/gcc-4.1/no-sys-dirs.patch | 303 ++++++++++-------- .../compilers/gcc-4.1/pass-cxxcpp.patch | 21 -- .../compilers/gcc-4.2/no-sys-dirs.patch | 68 ---- 5 files changed, 216 insertions(+), 242 deletions(-) delete mode 100644 pkgs/development/compilers/gcc-4.1/pass-cxxcpp.patch diff --git a/pkgs/development/compilers/gcc-4.1/builder.sh b/pkgs/development/compilers/gcc-4.1/builder.sh index 0440bd50f672..c17d04037027 100644 --- a/pkgs/development/compilers/gcc-4.1/builder.sh +++ b/pkgs/development/compilers/gcc-4.1/builder.sh @@ -31,33 +31,31 @@ if test "$noSysDirs" = "1"; then export NIX_FIXINC_DUMMY=/usr/include fi + extraCFlags="-g0 $extraCFlags" + extraLDFlags="--strip-debug $extraLDFlags" + export NIX_EXTRA_CFLAGS=$extraCFlags for i in $extraLDFlags; do export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i" - done - export CFLAGS=$extraCFlags - export CXXFLAGS=$extraCFlags + done + + makeFlagsArray=( \ + NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ + SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ + LIMITS_H_TEST=true \ + X_CFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ + LDFLAGS="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ + LDFLAGS_FOR_TARGET="$NIX_EXTRA_CFLAGS $NIX_EXTRA_LDFLAGS" \ + ) 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 $configureFlags" } @@ -70,6 +68,9 @@ postInstall() { # Remove `fixincl' to prevent a retained dependency on the # previous gcc. rm -rf $out/libexec/gcc/*/*/install-tools + + # Get rid of some "fixed" header files + rm -rf $out/lib/gcc/*/*/include/root } diff --git a/pkgs/development/compilers/gcc-4.1/default.nix b/pkgs/development/compilers/gcc-4.1/default.nix index ba4756eb82a7..0bbaf6d02b52 100644 --- a/pkgs/development/compilers/gcc-4.1/default.nix +++ b/pkgs/development/compilers/gcc-4.1/default.nix @@ -6,39 +6,50 @@ assert langC; +with import ../../../lib; + stdenv.mkDerivation { - name = "gcc-4.1.1"; + name = "gcc-4.1.2"; builder = ./builder.sh; src = [(fetchurl { - url = http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-core-4.1.1.tar.bz2; - md5 = "a1b189c98aa7d7f164036bbe89b9b2a2"; + url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-4.1.2/gcc-core-4.1.2.tar.bz2; + sha256 = "07binc1hqlr0g387zrg5sp57i12yzd5ja2lgjb83bbh0h3gwbsbv"; })] ++ (if /*langCC*/ true then [(fetchurl { - url = http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-g++-4.1.1.tar.bz2; - md5 = "70c786bf8ca042e880a87fecb9e4dfcd"; + url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-4.1.2/gcc-g++-4.1.2.tar.bz2; + sha256 = "1qm2izcxna10jai0v4s41myki0xkw9174qpl6k1rnrqhbx0sl1hc"; })] else []) ++ (if langF77 then [(fetchurl { - url = http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-fortran-4.1.1.tar.bz2; - md5 = "b088a28a1963d16bf505262f8bfd09db"; + url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-4.1.2/gcc-fortran-4.1.2.tar.bz2; + sha256 = "0772dhmm4gc10420h0d0mfkk2sirvjmjxz8j0ywm8wp5qf8vdi9z"; })] else []); patches = - [./pass-cxxcpp.patch] - ++ (if noSysDirs then [./no-sys-dirs.patch] else []); + optional noSysDirs [./no-sys-dirs.patch]; - inherit noSysDirs langC langCC langF77 profiledCompiler staticCompiler; + inherit noSysDirs profiledCompiler staticCompiler; configureFlags = " --disable-multilib --disable-libstdcxx-pch - --disable-libmudflap - --disable-libssp + --with-system-zlib + --enable-languages=${ + concatStrings (intersperse "," + ( optional langC "c" + ++ optional langCC "c++" + ++ optional langF77 "f77" + ) + ) + } + ${if stdenv.isi686 then "--with-arch=i686" else ""} "; makeFlags = if staticCompiler then "LDFLAGS=-static" else ""; + passthru = { inherit langC langCC langF77; }; + meta = { homepage = "http://gcc.gnu.org/"; license = "GPL/LGPL"; diff --git a/pkgs/development/compilers/gcc-4.1/no-sys-dirs.patch b/pkgs/development/compilers/gcc-4.1/no-sys-dirs.patch index b7b93d6944cc..7872e4901ef5 100644 --- a/pkgs/development/compilers/gcc-4.1/no-sys-dirs.patch +++ b/pkgs/development/compilers/gcc-4.1/no-sys-dirs.patch @@ -1,126 +1,177 @@ -diff -ruN gcc-4.1.0/gcc/cppdefault.c gcc-4.1.0.new/gcc/cppdefault.c ---- gcc-4.1.0/gcc/cppdefault.c 2005-06-25 04:02:01.000000000 +0200 -+++ gcc-4.1.0.new/gcc/cppdefault.c 2006-03-01 18:48:58.000000000 +0100 -@@ -41,6 +41,10 @@ - # 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 -ruN gcc-4.1.0/gcc/Makefile.in gcc-4.1.0.new/gcc/Makefile.in ---- gcc-4.1.0/gcc/Makefile.in 2006-02-16 16:23:24.000000000 +0100 -+++ gcc-4.1.0.new/gcc/Makefile.in 2006-03-01 18:55:12.000000000 +0100 -@@ -219,7 +219,7 @@ - CPPFLAGS = @CPPFLAGS@ - - # These exists to be overridden by the x-* and t-* files, respectively. --X_CFLAGS = -+X_CFLAGS = $(NIX_EXTRA_CFLAGS) $(NIX_EXTRA_LDFLAGS) - T_CFLAGS = - - X_CPPFLAGS = -@@ -383,7 +383,11 @@ - MD5_H = $(srcdir)/../include/md5.h - - # Default native SYSTEM_HEADER_DIR, to be overridden by targets. --NATIVE_SYSTEM_HEADER_DIR = /usr/include -+# 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@ - -@@ -395,7 +399,7 @@ - STMP_FIXINC = @STMP_FIXINC@ - - # Test to see whether exists in the system header files. --LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ] -+LIMITS_H_TEST = true - - # Directory for prefix to system directories, for - # each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc. -@@ -3002,7 +3006,7 @@ - -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)\" \ -+ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ - -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ - -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ - @TARGET_SYSTEM_ROOT_DEFINE@ -diff -ruN gcc-4.1.0/libstdc++-v3/include/Makefile.in gcc-4.1.0.new/libstdc++-v3/include/Makefile.in ---- gcc-4.1.0/libstdc++-v3/include/Makefile.in 2006-01-10 18:14:00.000000000 +0100 -+++ gcc-4.1.0.new/libstdc++-v3/include/Makefile.in 2006-03-01 18:57:32.000000000 +0100 -@@ -1257,8 +1257,8 @@ - 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; -+ $(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 -diff -ruN gcc-4.1.0/ltcf-cxx.sh gcc-4.1.0.new/ltcf-cxx.sh ---- gcc-4.1.0/ltcf-cxx.sh 2005-07-16 04:30:53.000000000 +0200 -+++ gcc-4.1.0.new/ltcf-cxx.sh 2006-03-01 18:58:15.000000000 +0100 -@@ -989,7 +989,7 @@ - # the conftest object file. - pre_test_object_deps_done=no - -- for p in `eval $output_verbose_link_cmd`; do -+ for p in `true`; do - - case $p in - -diff -ruN gcc-4.1.0/ltconfig gcc-4.1.0.new/ltconfig ---- gcc-4.1.0/ltconfig 2005-07-16 04:30:53.000000000 +0200 -+++ gcc-4.1.0.new/ltconfig 2006-03-01 18:59:58.000000000 +0100 -@@ -2322,6 +2322,11 @@ - # 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 - -diff -ruN gcc-4.1.0/Makefile.in gcc-4.1.0.new/Makefile.in ---- gcc-4.1.0/Makefile.in 2005-12-15 15:02:02.000000000 +0100 -+++ gcc-4.1.0.new/Makefile.in 2006-03-01 19:41:04.000000000 +0100 -@@ -286,7 +286,7 @@ - WINDRES = @WINDRES@ - - CFLAGS = @CFLAGS@ --LDFLAGS = -+LDFLAGS = $(NIX_EXTRA_LDFLAGS) - LIBCFLAGS = $(CFLAGS) - CXXFLAGS = @CXXFLAGS@ - LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates -@@ -329,12 +329,12 @@ - # 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) $(SYSROOT_CFLAGS_FOR_TARGET) -+CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(NIX_EXTRA_CFLAGS) - SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ --CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) -+CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(NIX_EXTRA_CFLAGS) - LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates --LDFLAGS_FOR_TARGET = -+LDFLAGS_FOR_TARGET = $(NIX_EXTRA_LDFLAGS) - PICFLAG_FOR_TARGET = - - # ------------------------------------ +diff -rc gcc-4.1.2-orig/Makefile.in gcc-4.1.2/Makefile.in +*** gcc-4.1.2-orig/Makefile.in Tue Apr 4 23:03:05 2006 +--- gcc-4.1.2/Makefile.in Wed May 23 11:35:41 2007 +*************** +*** 213,219 **** + RAW_CXX_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ + CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ +! CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; + + NORMAL_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ +--- 213,220 ---- + RAW_CXX_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ + CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ +! CXX="$(RAW_CXX_FOR_TARGET) $(CFLAGS_FOR_BUILD)"; export CXX; \ +! CXXCPP="$(RAW_CXX_FOR_TARGET) $(CFLAGS_FOR_BUILD) -E"; export CXXCPP; + + NORMAL_TARGET_EXPORTS = \ + $(BASE_TARGET_EXPORTS) \ +*************** +*** 352,357 **** +--- 353,366 ---- + @host_makefile_frag@ + ### + ++ CFLAGS += $(NIX_EXTRA_CFLAGS) ++ CPPFLAGS_FOR_TARGET += $(NIX_EXTRA_CFLAGS) ++ CXXFLAGS += $(NIX_EXTRA_CFLAGS) ++ LDFLAGS += $(NIX_EXTRA_LDFLAGS) ++ LDFLAGS_FOR_TARGET += $(NIX_EXTRA_LDFLAGS) ++ BOOT_CFLAGS += $(NIX_EXTRA_CFLAGS) ++ BOOT_LDFLAGS += $(NIX_EXTRA_LDFLAGS) ++ + # This is the list of directories that may be needed in RPATH_ENVVAR + # so that prorgams built for the target machine work. + TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libssp)$(HOST_LIB_PATH_gcc) +diff -rc gcc-4.1.2-orig/gcc/Makefile.in gcc-4.1.2/gcc/Makefile.in +*** gcc-4.1.2-orig/gcc/Makefile.in Wed Nov 1 15:40:44 2006 +--- gcc-4.1.2/gcc/Makefile.in Wed May 23 11:35:41 2007 +*************** +*** 383,389 **** + 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@ + +--- 383,393 ---- + 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@ + +*************** +*** 3007,3013 **** + -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@ +--- 3011,3017 ---- + -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@ +diff -rc gcc-4.1.2-orig/gcc/cppdefault.c gcc-4.1.2/gcc/cppdefault.c +*** gcc-4.1.2-orig/gcc/cppdefault.c Sat Jun 25 04:02:01 2005 +--- gcc-4.1.2/gcc/cppdefault.c Wed May 23 11:35:41 2007 +*************** +*** 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.1.2-orig/gcc/gcc.c gcc-4.1.2/gcc/gcc.c +*** gcc-4.1.2-orig/gcc/gcc.c Tue Nov 7 15:26:21 2006 +--- gcc-4.1.2/gcc/gcc.c Wed May 23 11:35:41 2007 +*************** +*** 1435,1444 **** + /* Default prefixes to attach to command names. */ + + #ifndef STANDARD_STARTFILE_PREFIX_1 +! #define STANDARD_STARTFILE_PREFIX_1 "/lib/" + #endif + #ifndef STANDARD_STARTFILE_PREFIX_2 +! #define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" + #endif + + #ifdef CROSS_COMPILE /* Don't use these prefixes for a cross compiler. */ +--- 1435,1444 ---- + /* Default prefixes to attach to command names. */ + + #ifndef STANDARD_STARTFILE_PREFIX_1 +! #define STANDARD_STARTFILE_PREFIX_1 "" + #endif + #ifndef STANDARD_STARTFILE_PREFIX_2 +! #define STANDARD_STARTFILE_PREFIX_2 "" + #endif + + #ifdef CROSS_COMPILE /* Don't use these prefixes for a cross compiler. */ +*************** +*** 1459,1466 **** + #endif + + static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX; +! static const char *const standard_exec_prefix_1 = "/usr/libexec/gcc/"; +! static const char *const standard_exec_prefix_2 = "/usr/lib/gcc/"; + static const char *md_exec_prefix = MD_EXEC_PREFIX; + + static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; +--- 1459,1466 ---- + #endif + + static const char *const standard_exec_prefix = STANDARD_EXEC_PREFIX; +! static const char *const standard_exec_prefix_1 = "/no-such-path/"; +! static const char *const standard_exec_prefix_2 = "/no-such-path/"; + static const char *md_exec_prefix = MD_EXEC_PREFIX; + + static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; +diff -rc gcc-4.1.2-orig/ltcf-cxx.sh gcc-4.1.2/ltcf-cxx.sh +*** gcc-4.1.2-orig/ltcf-cxx.sh Sat Jul 16 04:30:53 2005 +--- gcc-4.1.2/ltcf-cxx.sh Wed May 23 11:35:41 2007 +*************** +*** 989,995 **** + # the conftest object file. + pre_test_object_deps_done=no + +! for p in `eval $output_verbose_link_cmd`; do + + case $p in + +--- 989,995 ---- + # the conftest object file. + pre_test_object_deps_done=no + +! for p in `true`; do + + case $p in + +diff -rc gcc-4.1.2-orig/ltconfig gcc-4.1.2/ltconfig +*** gcc-4.1.2-orig/ltconfig Tue Jul 4 22:30:34 2006 +--- gcc-4.1.2/ltconfig Wed May 23 11:35:41 2007 +*************** +*** 2322,2327 **** +--- 2322,2332 ---- + # 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_CFLAGS $NIX_EXTRA_LDFLAGS" ++ + # Is the compiler the GNU C compiler? + with_gcc=$with_gcc + diff --git a/pkgs/development/compilers/gcc-4.1/pass-cxxcpp.patch b/pkgs/development/compilers/gcc-4.1/pass-cxxcpp.patch deleted file mode 100644 index 9b0676d4fdc9..000000000000 --- a/pkgs/development/compilers/gcc-4.1/pass-cxxcpp.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rc gcc-orig/Makefile.in gcc-4.1.1/Makefile.in -*** gcc-orig/Makefile.in Wed Jun 21 13:40:23 2006 ---- gcc-4.1.1/Makefile.in Wed Jun 21 14:19:44 2006 -*************** -*** 213,219 **** - RAW_CXX_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ - CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ -! CXX="$(RAW_CXX_FOR_TARGET)"; export CXX; - - NORMAL_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ ---- 213,220 ---- - RAW_CXX_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ - CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \ -! CXX="$(RAW_CXX_FOR_TARGET) $(CFLAGS_FOR_BUILD)"; export CXX; \ -! CXXCPP="$(RAW_CXX_FOR_TARGET) $(CFLAGS_FOR_BUILD) -E"; export CXXCPP; - - NORMAL_TARGET_EXPORTS = \ - $(BASE_TARGET_EXPORTS) \ diff --git a/pkgs/development/compilers/gcc-4.2/no-sys-dirs.patch b/pkgs/development/compilers/gcc-4.2/no-sys-dirs.patch index d38251fb4d6d..d87f54669b7b 100644 --- a/pkgs/development/compilers/gcc-4.2/no-sys-dirs.patch +++ b/pkgs/development/compilers/gcc-4.2/no-sys-dirs.patch @@ -120,74 +120,6 @@ diff -rc gcc-4.2.0-orig/gcc/gcc.c gcc-4.2.0/gcc/gcc.c static const char *md_exec_prefix = MD_EXEC_PREFIX; static const char *md_startfile_prefix = MD_STARTFILE_PREFIX; -diff -rc gcc-4.2.0-orig/libstdc++-v3/include/Makefile.in gcc-4.2.0/libstdc++-v3/include/Makefile.in -*** gcc-4.2.0-orig/libstdc++-v3/include/Makefile.in 2007-04-13 01:06:37.000000000 +0200 ---- gcc-4.2.0/libstdc++-v3/include/Makefile.in 2007-05-20 17:16:44.000000000 +0200 -*************** -*** 1433,1446 **** - if [ ! -d "${pch1_output_builddir}" ]; then \ - mkdir -p ${pch1_output_builddir}; \ - fi; \ -! $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O0 -g ${pch1_source} -o $@ - touch ${pch1_output_anchor} - - ${pch1b_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source} - if [ ! -d "${pch1_output_builddir}" ]; then \ - mkdir -p ${pch1_output_builddir}; \ - fi; \ -! $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch1_source} -o $@ - touch ${pch1_output_anchor} - - # Build a precompiled TR1 include, stdtr1c++.h.gch/O2.gch ---- 1433,1446 ---- - if [ ! -d "${pch1_output_builddir}" ]; then \ - mkdir -p ${pch1_output_builddir}; \ - fi; \ -! $(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) -O0 -g ${pch1_source} -o $@ - touch ${pch1_output_anchor} - - ${pch1b_output}: ${allstamped} ${host_builddir}/c++config.h ${pch1_source} - if [ ! -d "${pch1_output_builddir}" ]; then \ - mkdir -p ${pch1_output_builddir}; \ - fi; \ -! $(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch1_source} -o $@ - touch ${pch1_output_anchor} - - # Build a precompiled TR1 include, stdtr1c++.h.gch/O2.gch -*************** -*** 1448,1454 **** - if [ ! -d "${pch2_output_builddir}" ]; then \ - mkdir -p ${pch2_output_builddir}; \ - fi; \ -! $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch2_source} -o $@ - touch ${pch2_output_anchor} - - # Build a precompiled extension include, extc++.h.gch/O2.gch ---- 1448,1454 ---- - if [ ! -d "${pch2_output_builddir}" ]; then \ - mkdir -p ${pch2_output_builddir}; \ - fi; \ -! $(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch2_source} -o $@ - touch ${pch2_output_anchor} - - # Build a precompiled extension include, extc++.h.gch/O2.gch -*************** -*** 1456,1462 **** - if [ ! -d "${pch3_output_builddir}" ]; then \ - mkdir -p ${pch3_output_builddir}; \ - fi; \ -! $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch3_source} -o $@ - touch ${pch3_output_anchor} - - # For robustness sake (in light of junk files or in-source ---- 1456,1462 ---- - if [ ! -d "${pch3_output_builddir}" ]; then \ - mkdir -p ${pch3_output_builddir}; \ - fi; \ -! $(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) -O2 -g ${pch3_source} -o $@ - touch ${pch3_output_anchor} - - # For robustness sake (in light of junk files or in-source diff -rc gcc-4.2.0-orig/ltcf-cxx.sh gcc-4.2.0/ltcf-cxx.sh *** gcc-4.2.0-orig/ltcf-cxx.sh 2005-07-16 04:30:53.000000000 +0200 --- gcc-4.2.0/ltcf-cxx.sh 2007-05-20 17:16:44.000000000 +0200