1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/patches/gcc/4.4.0/370-bootstrap-target_lib_path.patch Wed Jan 06 23:25:08 2010 +0100
1.3 @@ -0,0 +1,40 @@
1.4 +ChangeLog:
1.5 +2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1.6 +
1.7 + PR bootstrap/41818
1.8 + * Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
1.9 + to $(RPATH_ENVVAR) if bootstrapping.
1.10 + * Makefile.in: Regenerate.
1.11 +
1.12 +diff --git a/Makefile.in b/Makefile.in
1.13 +index e5fa1d3..dbfc1f0 100644
1.14 +--- a/Makefile.in
1.15 ++++ b/Makefile.in
1.16 +@@ -281,7 +281,10 @@ BASE_TARGET_EXPORTS = \
1.17 + STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
1.18 + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
1.19 + WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
1.20 +- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
1.21 ++@if gcc-bootstrap
1.22 ++ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
1.23 ++@endif gcc-bootstrap
1.24 ++ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
1.25 +
1.26 + RAW_CXX_TARGET_EXPORTS = \
1.27 + $(BASE_TARGET_EXPORTS) \
1.28 +diff --git a/Makefile.tpl b/Makefile.tpl
1.29 +index 15102e5..452d47c 100644
1.30 +--- a/Makefile.tpl
1.31 ++++ b/Makefile.tpl
1.32 +@@ -284,7 +284,10 @@ BASE_TARGET_EXPORTS = \
1.33 + STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
1.34 + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
1.35 + WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
1.36 +- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
1.37 ++@if gcc-bootstrap
1.38 ++ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
1.39 ++@endif gcc-bootstrap
1.40 ++ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
1.41 +
1.42 + RAW_CXX_TARGET_EXPORTS = \
1.43 + $(BASE_TARGET_EXPORTS) \
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/patches/gcc/4.4.1/370-bootstrap-target_lib_path.patch Wed Jan 06 23:25:08 2010 +0100
2.3 @@ -0,0 +1,40 @@
2.4 +ChangeLog:
2.5 +2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
2.6 +
2.7 + PR bootstrap/41818
2.8 + * Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
2.9 + to $(RPATH_ENVVAR) if bootstrapping.
2.10 + * Makefile.in: Regenerate.
2.11 +
2.12 +diff --git a/Makefile.in b/Makefile.in
2.13 +index e5fa1d3..dbfc1f0 100644
2.14 +--- a/Makefile.in
2.15 ++++ b/Makefile.in
2.16 +@@ -281,7 +281,10 @@ BASE_TARGET_EXPORTS = \
2.17 + STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
2.18 + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
2.19 + WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
2.20 +- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
2.21 ++@if gcc-bootstrap
2.22 ++ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
2.23 ++@endif gcc-bootstrap
2.24 ++ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
2.25 +
2.26 + RAW_CXX_TARGET_EXPORTS = \
2.27 + $(BASE_TARGET_EXPORTS) \
2.28 +diff --git a/Makefile.tpl b/Makefile.tpl
2.29 +index 15102e5..452d47c 100644
2.30 +--- a/Makefile.tpl
2.31 ++++ b/Makefile.tpl
2.32 +@@ -284,7 +284,10 @@ BASE_TARGET_EXPORTS = \
2.33 + STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
2.34 + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
2.35 + WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
2.36 +- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
2.37 ++@if gcc-bootstrap
2.38 ++ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
2.39 ++@endif gcc-bootstrap
2.40 ++ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
2.41 +
2.42 + RAW_CXX_TARGET_EXPORTS = \
2.43 + $(BASE_TARGET_EXPORTS) \
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/patches/gcc/4.4.2/370-bootstrap-target_lib_path.patch Wed Jan 06 23:25:08 2010 +0100
3.3 @@ -0,0 +1,40 @@
3.4 +ChangeLog:
3.5 +2010-01-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
3.6 +
3.7 + PR bootstrap/41818
3.8 + * Makefile.tpl (BASE_TARGET_EXPORTS): Only add TARGET_LIB_PATH
3.9 + to $(RPATH_ENVVAR) if bootstrapping.
3.10 + * Makefile.in: Regenerate.
3.11 +
3.12 +diff --git a/Makefile.in b/Makefile.in
3.13 +index e5fa1d3..dbfc1f0 100644
3.14 +--- a/Makefile.in
3.15 ++++ b/Makefile.in
3.16 +@@ -281,7 +281,10 @@ BASE_TARGET_EXPORTS = \
3.17 + STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
3.18 + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
3.19 + WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
3.20 +- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
3.21 ++@if gcc-bootstrap
3.22 ++ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
3.23 ++@endif gcc-bootstrap
3.24 ++ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
3.25 +
3.26 + RAW_CXX_TARGET_EXPORTS = \
3.27 + $(BASE_TARGET_EXPORTS) \
3.28 +diff --git a/Makefile.tpl b/Makefile.tpl
3.29 +index 15102e5..452d47c 100644
3.30 +--- a/Makefile.tpl
3.31 ++++ b/Makefile.tpl
3.32 +@@ -284,7 +284,10 @@ BASE_TARGET_EXPORTS = \
3.33 + STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
3.34 + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
3.35 + WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
3.36 +- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
3.37 ++@if gcc-bootstrap
3.38 ++ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
3.39 ++@endif gcc-bootstrap
3.40 ++ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
3.41 +
3.42 + RAW_CXX_TARGET_EXPORTS = \
3.43 + $(BASE_TARGET_EXPORTS) \