public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Backported the gcc 4.2 patch to 4.1

Browse Source 
* Update to gcc 4.1.2.
* Removed some unnecessary stuff from the patch.

svn path=/nixpkgs/trunk/; revision=8739
This commit is contained in:
Eelco Dolstra 2007-05-24 13:30:09 +00:00
parent b5edfc05dc
commit 2a804eb95b
5 changed files with 216 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/development/compilers/gcc-4.1/builder.sh
View File

@ -31,33 +31,31 @@ if test "$noSysDirs" = "1"; then
export NIX_FIXINC_DUMMY=/usr/include export NIX_FIXINC_DUMMY=/usr/include
fi fi
extraCFlags="-g0 $extraCFlags"
extraLDFlags="--strip-debug $extraLDFlags"
export NIX_EXTRA_CFLAGS=$extraCFlags export NIX_EXTRA_CFLAGS=$extraCFlags
for i in $extraLDFlags; do for i in $extraLDFlags; do
export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i" export NIX_EXTRA_LDFLAGS="$NIX_EXTRA_LDFLAGS -Wl,$i"
done done
export CFLAGS=$extraCFlags
export CXXFLAGS=$extraCFlags 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 fi
preConfigure=preConfigure preConfigure=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. # Perform the build in a different directory.
mkdir ../build mkdir ../build
cd ../build cd ../build
configureScript=../$sourceRoot/configure configureScript=../$sourceRoot/configure
configureFlags="--enable-languages=$langs $configureFlags"
} }
@ -70,6 +68,9 @@ postInstall() {
# Remove `fixincl' to prevent a retained dependency on the # Remove `fixincl' to prevent a retained dependency on the
# previous gcc. # previous gcc.
rm -rf $out/libexec/gcc/*/*/install-tools rm -rf $out/libexec/gcc/*/*/install-tools
# Get rid of some "fixed" header files
rm -rf $out/lib/gcc/*/*/include/root
} }

35
pkgs/development/compilers/gcc-4.1/default.nix
View File

@ -6,39 +6,50 @@
assert langC; assert langC;
with import ../../../lib;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "gcc-4.1.1"; name = "gcc-4.1.2";
builder = ./builder.sh; builder = ./builder.sh;
src = src =
[(fetchurl { [(fetchurl {
url = http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-core-4.1.1.tar.bz2; url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-4.1.2/gcc-core-4.1.2.tar.bz2;
md5 = "a1b189c98aa7d7f164036bbe89b9b2a2"; sha256 = "07binc1hqlr0g387zrg5sp57i12yzd5ja2lgjb83bbh0h3gwbsbv";
})] ++ })] ++
(if /*langCC*/ true then [(fetchurl { (if /*langCC*/ true then [(fetchurl {
url = http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-g++-4.1.1.tar.bz2; url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-4.1.2/gcc-g++-4.1.2.tar.bz2;
md5 = "70c786bf8ca042e880a87fecb9e4dfcd"; sha256 = "1qm2izcxna10jai0v4s41myki0xkw9174qpl6k1rnrqhbx0sl1hc";
})] else []) ++ })] else []) ++
(if langF77 then [(fetchurl { (if langF77 then [(fetchurl {
url = http://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-fortran-4.1.1.tar.bz2; url = ftp://ftp.nluug.nl/mirror/languages/gcc/releases/gcc-4.1.2/gcc-fortran-4.1.2.tar.bz2;
md5 = "b088a28a1963d16bf505262f8bfd09db"; sha256 = "0772dhmm4gc10420h0d0mfkk2sirvjmjxz8j0ywm8wp5qf8vdi9z";
})] else []); })] else []);
patches = patches =
[./pass-cxxcpp.patch] optional noSysDirs [./no-sys-dirs.patch];
++ (if noSysDirs then [./no-sys-dirs.patch] else []);
inherit noSysDirs langC langCC langF77 profiledCompiler staticCompiler; inherit noSysDirs profiledCompiler staticCompiler;
configureFlags = " configureFlags = "
--disable-multilib --disable-multilib
--disable-libstdcxx-pch --disable-libstdcxx-pch
--disable-libmudflap --with-system-zlib
--disable-libssp --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 ""; makeFlags = if staticCompiler then "LDFLAGS=-static" else "";
passthru = { inherit langC langCC langF77; };
meta = { meta = {
homepage = "http://gcc.gnu.org/"; homepage = "http://gcc.gnu.org/";
license = "GPL/LGPL"; license = "GPL/LGPL";

303
pkgs/development/compilers/gcc-4.1/no-sys-dirs.patch
View File

@ -1,126 +1,177 @@
diff -ruN gcc-4.1.0/gcc/cppdefault.c gcc-4.1.0.new/gcc/cppdefault.c diff -rc gcc-4.1.2-orig/Makefile.in gcc-4.1.2/Makefile.in
--- gcc-4.1.0/gcc/cppdefault.c 2005-06-25 04:02:01.000000000 +0200 *** gcc-4.1.2-orig/Makefile.in Tue Apr 4 23:03:05 2006
+++ gcc-4.1.0.new/gcc/cppdefault.c 2006-03-01 18:48:58.000000000 +0100 --- gcc-4.1.2/Makefile.in Wed May 23 11:35:41 2007
@@ -41,6 +41,10 @@ ***************
# undef CROSS_INCLUDE_DIR *** 213,219 ****
#endif RAW_CXX_TARGET_EXPORTS = \
$(BASE_TARGET_EXPORTS) \
+#undef LOCAL_INCLUDE_DIR CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
+#undef SYSTEM_INCLUDE_DIR ! CXX="$(RAW_CXX_FOR_TARGET)"; export CXX;
+#undef STANDARD_INCLUDE_DIR
+ NORMAL_TARGET_EXPORTS = \
const struct default_include cpp_include_defaults[] $(BASE_TARGET_EXPORTS) \
#ifdef INCLUDE_DEFAULTS --- 213,220 ----
= INCLUDE_DEFAULTS; RAW_CXX_TARGET_EXPORTS = \
diff -ruN gcc-4.1.0/gcc/Makefile.in gcc-4.1.0.new/gcc/Makefile.in $(BASE_TARGET_EXPORTS) \
--- gcc-4.1.0/gcc/Makefile.in 2006-02-16 16:23:24.000000000 +0100 CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
+++ gcc-4.1.0.new/gcc/Makefile.in 2006-03-01 18:55:12.000000000 +0100 ! CXX="$(RAW_CXX_FOR_TARGET) $(CFLAGS_FOR_BUILD)"; export CXX; \
@@ -219,7 +219,7 @@ ! CXXCPP="$(RAW_CXX_FOR_TARGET) $(CFLAGS_FOR_BUILD) -E"; export CXXCPP;
CPPFLAGS = @CPPFLAGS@
NORMAL_TARGET_EXPORTS = \
# These exists to be overridden by the x-* and t-* files, respectively. $(BASE_TARGET_EXPORTS) \
-X_CFLAGS = ***************
+X_CFLAGS = $(NIX_EXTRA_CFLAGS) $(NIX_EXTRA_LDFLAGS) *** 352,357 ****
T_CFLAGS = --- 353,366 ----
@host_makefile_frag@
X_CPPFLAGS = ###
@@ -383,7 +383,11 @@
MD5_H = $(srcdir)/../include/md5.h + CFLAGS += $(NIX_EXTRA_CFLAGS)
+ CPPFLAGS_FOR_TARGET += $(NIX_EXTRA_CFLAGS)
# Default native SYSTEM_HEADER_DIR, to be overridden by targets. + CXXFLAGS += $(NIX_EXTRA_CFLAGS)
-NATIVE_SYSTEM_HEADER_DIR = /usr/include + LDFLAGS += $(NIX_EXTRA_LDFLAGS)
+# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent + LDFLAGS_FOR_TARGET += $(NIX_EXTRA_LDFLAGS)
+# `fixinc' from fixing header files in /usr/include. However, + BOOT_CFLAGS += $(NIX_EXTRA_CFLAGS)
+# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set + BOOT_LDFLAGS += $(NIX_EXTRA_LDFLAGS)
+# it to some dummy directory. +
+NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY) # This is the list of directories that may be needed in RPATH_ENVVAR
# Default cross SYSTEM_HEADER_DIR, to be overridden by targets. # so that prorgams built for the target machine work.
CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ 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
@@ -395,7 +399,7 @@ *** gcc-4.1.2-orig/gcc/Makefile.in Wed Nov 1 15:40:44 2006
STMP_FIXINC = @STMP_FIXINC@ --- gcc-4.1.2/gcc/Makefile.in Wed May 23 11:35:41 2007
***************
# Test to see whether <limits.h> exists in the system header files. *** 383,389 ****
-LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ] MD5_H = $(srcdir)/../include/md5.h
+LIMITS_H_TEST = true
# Default native SYSTEM_HEADER_DIR, to be overridden by targets.
# Directory for prefix to system directories, for ! NATIVE_SYSTEM_HEADER_DIR = /usr/include
# each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc. # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
@@ -3002,7 +3006,7 @@ CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
-DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
-DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ --- 383,393 ----
-DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ MD5_H = $(srcdir)/../include/md5.h
- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
+ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
-DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ ! # Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent
-DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ ! # `fixinc' from fixing header files in /usr/include. However,
@TARGET_SYSTEM_ROOT_DEFINE@ ! # NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set
diff -ruN gcc-4.1.0/libstdc++-v3/include/Makefile.in gcc-4.1.0.new/libstdc++-v3/include/Makefile.in ! # it to some dummy directory.
--- gcc-4.1.0/libstdc++-v3/include/Makefile.in 2006-01-10 18:14:00.000000000 +0100 ! NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY)
+++ gcc-4.1.0.new/libstdc++-v3/include/Makefile.in 2006-03-01 18:57:32.000000000 +0100 # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
@@ -1257,8 +1257,8 @@ CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
if [ ! -d "${pch_output_builddir}" ]; then \
mkdir -p ${pch_output_builddir}; \ ***************
fi; \ *** 3007,3013 ****
- $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g.gch; \ -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
- $(CXX) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g.gch; -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \
+ $(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O0 -g -o ${pch_output_builddir}/O0g.gch; \ -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
+ $(CXX) $(CFLAGS) $(PCHFLAGS) $(AM_CPPFLAGS) ${pch_source} -O2 -g -o ${pch_output_builddir}/O2g.gch; ! -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
-DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
# For robustness sake (in light of junk files or in-source -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
# configuration), copy from the build or source tree to the install @TARGET_SYSTEM_ROOT_DEFINE@
diff -ruN gcc-4.1.0/ltcf-cxx.sh gcc-4.1.0.new/ltcf-cxx.sh --- 3011,3017 ----
--- gcc-4.1.0/ltcf-cxx.sh 2005-07-16 04:30:53.000000000 +0200 -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+++ gcc-4.1.0.new/ltcf-cxx.sh 2006-03-01 18:58:15.000000000 +0100 -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \
@@ -989,7 +989,7 @@ -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
# the conftest object file. ! -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \
pre_test_object_deps_done=no -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
-DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
- for p in `eval $output_verbose_link_cmd`; do @TARGET_SYSTEM_ROOT_DEFINE@
+ for p in `true`; do 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
case $p in --- gcc-4.1.2/gcc/cppdefault.c Wed May 23 11:35:41 2007
***************
diff -ruN gcc-4.1.0/ltconfig gcc-4.1.0.new/ltconfig *** 41,46 ****
--- gcc-4.1.0/ltconfig 2005-07-16 04:30:53.000000000 +0200 --- 41,50 ----
+++ gcc-4.1.0.new/ltconfig 2006-03-01 18:59:58.000000000 +0100 # undef CROSS_INCLUDE_DIR
@@ -2322,6 +2322,11 @@ #endif
# A language-specific compiler.
CC=$CC + #undef LOCAL_INCLUDE_DIR
+ #undef SYSTEM_INCLUDE_DIR
+# Ugly hack to get libmudflap (and possibly other libraries) to build. + #undef STANDARD_INCLUDE_DIR
+# Libtool filters out \`-B' flags when linking (why?), so the \`-B' flag +
+# to Glibc gets lost. Here we forcibly add it to any invocation. const struct default_include cpp_include_defaults[]
+CC="\$CC $NIX_EXTRA_LDFLAGS" #ifdef INCLUDE_DEFAULTS
+ = INCLUDE_DEFAULTS;
# Is the compiler the GNU C compiler? diff -rc gcc-4.1.2-orig/gcc/gcc.c gcc-4.1.2/gcc/gcc.c
with_gcc=$with_gcc *** 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
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 *** 1435,1444 ****
+++ gcc-4.1.0.new/Makefile.in 2006-03-01 19:41:04.000000000 +0100 /* Default prefixes to attach to command names. */
@@ -286,7 +286,7 @@
WINDRES = @WINDRES@ #ifndef STANDARD_STARTFILE_PREFIX_1
! #define STANDARD_STARTFILE_PREFIX_1 "/lib/"
CFLAGS = @CFLAGS@ #endif
-LDFLAGS = #ifndef STANDARD_STARTFILE_PREFIX_2
+LDFLAGS = $(NIX_EXTRA_LDFLAGS) ! #define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
LIBCFLAGS = $(CFLAGS) #endif
CXXFLAGS = @CXXFLAGS@
LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates #ifdef CROSS_COMPILE /* Don't use these prefixes for a cross compiler. */
@@ -329,12 +329,12 @@ --- 1435,1444 ----
# CFLAGS will be just -g. We want to ensure that TARGET libraries /* Default prefixes to attach to command names. */
# (which we know are built with gcc) are built with optimizations so
# prepend -O2 when setting CFLAGS_FOR_TARGET. #ifndef STANDARD_STARTFILE_PREFIX_1
-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) ! #define STANDARD_STARTFILE_PREFIX_1 ""
+CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(NIX_EXTRA_CFLAGS) #endif
SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ #ifndef STANDARD_STARTFILE_PREFIX_2
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) ! #define STANDARD_STARTFILE_PREFIX_2 ""
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) $(NIX_EXTRA_CFLAGS) #endif
LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates #ifdef CROSS_COMPILE /* Don't use these prefixes for a cross compiler. */
-LDFLAGS_FOR_TARGET = ***************
+LDFLAGS_FOR_TARGET = $(NIX_EXTRA_LDFLAGS) *** 1459,1466 ****
PICFLAG_FOR_TARGET = #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

21
pkgs/development/compilers/gcc-4.1/pass-cxxcpp.patch
View File

@ -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) \

68
pkgs/development/compilers/gcc-4.2/no-sys-dirs.patch
View File

@ -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_exec_prefix = MD_EXEC_PREFIX;
static const char *md_startfile_prefix = MD_STARTFILE_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 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-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 --- gcc-4.2.0/ltcf-cxx.sh 2007-05-20 17:16:44.000000000 +0200