fix patch to work on gcc-4.0.x #133098 by John Bachan

2 files changed, 34 insertions, 20 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index e95e02f39764..eeb0b050f975 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.2.1/gcc31-loop-load-final-value.patch 3324 RMD160 8bb0e9133923821daf2e9d10a27a0a1930e00bbd SHA1 c73dc6e19a76a1dcbb11a15ff5ff04b11a9f0343 SHA256 70aa8433fb19c95f334b6cbc155cae22a3b61a6892ed9e18f95860509d0091a8 size 3324
 MD5 8ec9b0352d226e4693cabffe0fa5bba6 files/3.2.1/gcc31-loop-load-final-value.patch 3324
 RMD160 8bb0e9133923821daf2e9d10a27a0a1930e00bbd files/3.2.1/gcc31-loop-load-final-value.patch 3324
@@ -202,14 +205,18 @@ AUX 3.4.4/gcc-3.4.4-softfloat.patch 5242 RMD160 7607a94c3bbb599704153bb0041f369a
 MD5 2c355d808b490994c6566b10f3c0ba27 files/3.4.4/gcc-3.4.4-softfloat.patch 5242
 RMD160 7607a94c3bbb599704153bb0041f369abff4a5f4 files/3.4.4/gcc-3.4.4-softfloat.patch 5242
 SHA256 fd4bf1bf8e78e2c7f041866594351be359341db876d81c0e9ad089db8e84a516 files/3.4.4/gcc-3.4.4-softfloat.patch 5242
-AUX 4.0.2/gcc-4.0.2-cross-compile.patch 1134 RMD160 70d7ba1cf19700597b812a08c7dcd72633a25c2a SHA1 d016b84010d2cd049d8974a8fcc1dae02e043d3d SHA256 8ee57285151659793df88e025f1225b401a0c805bfc8d1685e04ef75393a24ab size 1134
-MD5 6b71690a4a020aa0604a1f8fad21151b files/4.0.2/gcc-4.0.2-cross-compile.patch 1134
-RMD160 70d7ba1cf19700597b812a08c7dcd72633a25c2a files/4.0.2/gcc-4.0.2-cross-compile.patch 1134
-SHA256 8ee57285151659793df88e025f1225b401a0c805bfc8d1685e04ef75393a24ab files/4.0.2/gcc-4.0.2-cross-compile.patch 1134
+AUX 4.0.2/gcc-4.0.2-cross-compile.patch 1283 RMD160 772a61065064eeee39f0a4ffb381eeaf9c56c53f SHA1 8cb2ecea00fe9581416dd28b10370a370f12dab5 SHA256 f86427e8a73aa28e1f2e2f19bf27a9ed92c716319543c8bad8b3247fc7627182 size 1283
+MD5 6abf60cbdcf45b7f3ef25789dd683f22 files/4.0.2/gcc-4.0.2-cross-compile.patch 1283
+RMD160 772a61065064eeee39f0a4ffb381eeaf9c56c53f files/4.0.2/gcc-4.0.2-cross-compile.patch 1283
+SHA256 f86427e8a73aa28e1f2e2f19bf27a9ed92c716319543c8bad8b3247fc7627182 files/4.0.2/gcc-4.0.2-cross-compile.patch 1283
 AUX 4.0.2/gcc-4.0.2-softfloat.patch 2790 RMD160 c5ad6efdacf01b128db4a1226e254af6f2789330 SHA1 d99d6f940a42be9576195eb851261d3a208b705b SHA256 1525a48bd087c0f0d89db128a16ee106252daf7bf34ffb45867d30f6c452de2c size 2790
 MD5 51eab04de222aa60204d6c3a23f0c3d2 files/4.0.2/gcc-4.0.2-softfloat.patch 2790
 RMD160 c5ad6efdacf01b128db4a1226e254af6f2789330 files/4.0.2/gcc-4.0.2-softfloat.patch 2790
 SHA256 1525a48bd087c0f0d89db128a16ee106252daf7bf34ffb45867d30f6c452de2c files/4.0.2/gcc-4.0.2-softfloat.patch 2790
+AUX 4.1.0/gcc-4.1.0-cross-compile.patch 1134 RMD160 70d7ba1cf19700597b812a08c7dcd72633a25c2a SHA1 d016b84010d2cd049d8974a8fcc1dae02e043d3d SHA256 8ee57285151659793df88e025f1225b401a0c805bfc8d1685e04ef75393a24ab size 1134
+MD5 6b71690a4a020aa0604a1f8fad21151b files/4.1.0/gcc-4.1.0-cross-compile.patch 1134
+RMD160 70d7ba1cf19700597b812a08c7dcd72633a25c2a files/4.1.0/gcc-4.1.0-cross-compile.patch 1134
+SHA256 8ee57285151659793df88e025f1225b401a0c805bfc8d1685e04ef75393a24ab files/4.1.0/gcc-4.1.0-cross-compile.patch 1134
 AUX awk/fixlafiles.awk 7865 RMD160 6283a91bfa309a91f46cbff3c1c4f0d848312ba4 SHA1 0bd923243492496eceb8ec1407ed9f4ac5ad8c1a SHA256 9fccd7f4ee7170a8f05d21777974efc3f23072f501cb7d2a8e9eeea15e541249 size 7865
 MD5 fed3620378df7a876d6709ddf3f7bbec files/awk/fixlafiles.awk 7865
 RMD160 6283a91bfa309a91f46cbff3c1c4f0d848312ba4 files/awk/fixlafiles.awk 7865
@@ -391,10 +398,10 @@ EBUILD gcc-3.4.5.ebuild 5015 RMD160 e7e5c9910801a156ed7f8537b22f076e9e48b677 SHA
 MD5 6903d912f2f3858ff91b15657bc04d58 gcc-3.4.5.ebuild 5015
 RMD160 e7e5c9910801a156ed7f8537b22f076e9e48b677 gcc-3.4.5.ebuild 5015
 SHA256 7c2bb48fc3a905ff47d184b301561d2a2b57c787bdc4bddd76f46e9f0b9529a0 gcc-3.4.5.ebuild 5015
-EBUILD gcc-3.4.6-r1.ebuild 5112 RMD160 6537a948daff554b39dacb30a1ad07a9a08d2896 SHA1 5ea481605bcf5f05ce3a8c9cc7ab5741b7e45876 SHA256 d6fd4c88c6189d7432abcd0149df1cdb78439a062b2c31d988c695218a5dac3a size 5112
-MD5 769f1dbb68bf0e0c1f938513143a7900 gcc-3.4.6-r1.ebuild 5112
-RMD160 6537a948daff554b39dacb30a1ad07a9a08d2896 gcc-3.4.6-r1.ebuild 5112
-SHA256 d6fd4c88c6189d7432abcd0149df1cdb78439a062b2c31d988c695218a5dac3a gcc-3.4.6-r1.ebuild 5112
+EBUILD gcc-3.4.6-r1.ebuild 5114 RMD160 d8344554ff83cf9b20eb45d9fc7e424e787e7991 SHA1 e40a901982349f9cff605b3dfc29d85b8ebe7876 SHA256 978ee2e24033b717cd8f04719d38966f39b5c58674f6612da7542422f7bcd660 size 5114
+MD5 f4b885c94ecf36b0b32915e5dd31d58f gcc-3.4.6-r1.ebuild 5114
+RMD160 d8344554ff83cf9b20eb45d9fc7e424e787e7991 gcc-3.4.6-r1.ebuild 5114
+SHA256 978ee2e24033b717cd8f04719d38966f39b5c58674f6612da7542422f7bcd660 gcc-3.4.6-r1.ebuild 5114
 EBUILD gcc-3.4.6.ebuild 5096 RMD160 498f7d241822cc12a55a280a212b98d392c292b6 SHA1 00bb6bf892a1d1ac1e497881ef3309b929712156 SHA256 cf1204ef2833b80c33dc8c65f697ee8a97e26a2ed62dde38a46c6518643c153e size 5096
 MD5 9cd624e5441af6ef55f370171da3d445 gcc-3.4.6.ebuild 5096
 RMD160 498f7d241822cc12a55a280a212b98d392c292b6 gcc-3.4.6.ebuild 5096
@@ -407,18 +414,18 @@ EBUILD gcc-4.0.3.ebuild 1849 RMD160 b72626ee4faf5bac914bf1984572db2a1f69a32b SHA
 MD5 1853f3ff19563e5b478c628fbb70abb0 gcc-4.0.3.ebuild 1849
 RMD160 b72626ee4faf5bac914bf1984572db2a1f69a32b gcc-4.0.3.ebuild 1849
 SHA256 412f75c10110711ae32ee19a434dc1659d21f8b8312b8c231d596a9fe5b01010 gcc-4.0.3.ebuild 1849
-EBUILD gcc-4.1.0.ebuild 1890 RMD160 eb3b310d0e865220c96f709f2778245de0e9771e SHA1 b20908fa85adf2e95c824dad67b211aeb3b47133 SHA256 ab17be097a693283761bea6840ad2c76401a52ca4d958ef4ce5ac7b1982765eb size 1890
-MD5 2b724deba51d51894ac0e03d9f0dfa5d gcc-4.1.0.ebuild 1890
-RMD160 eb3b310d0e865220c96f709f2778245de0e9771e gcc-4.1.0.ebuild 1890
-SHA256 ab17be097a693283761bea6840ad2c76401a52ca4d958ef4ce5ac7b1982765eb gcc-4.1.0.ebuild 1890
+EBUILD gcc-4.1.0.ebuild 1890 RMD160 5fed0ec18a50034e65dd8e7c32c545eb91af08be SHA1 8ac965ae695f9776a124d468ddc036919b00e118 SHA256 70cda87b79b711a58a9e435bdc93f6c8d48cfbadf4300cce7b07bc59d0b2822f size 1890
+MD5 57caef36b6a4d6583c1ff821ec839b8a gcc-4.1.0.ebuild 1890
+RMD160 5fed0ec18a50034e65dd8e7c32c545eb91af08be gcc-4.1.0.ebuild 1890
+SHA256 70cda87b79b711a58a9e435bdc93f6c8d48cfbadf4300cce7b07bc59d0b2822f gcc-4.1.0.ebuild 1890
 EBUILD gcc-4.2.0_alpha20060506.ebuild 2040 RMD160 6f2b1f5f48901da3586f6fbbf4e745a5c7b41627 SHA1 50d34fdba218c16ed1bbf18e869be7eda3cfdafd SHA256 5838d1836370b319d74d19de6f085bc2f4a2c1d8f1707a19ab4062e915531a12 size 2040
 MD5 77016942a11c286d41d4320e94553f42 gcc-4.2.0_alpha20060506.ebuild 2040
 RMD160 6f2b1f5f48901da3586f6fbbf4e745a5c7b41627 gcc-4.2.0_alpha20060506.ebuild 2040
 SHA256 5838d1836370b319d74d19de6f085bc2f4a2c1d8f1707a19ab4062e915531a12 gcc-4.2.0_alpha20060506.ebuild 2040
-MISC ChangeLog 106773 RMD160 40df0b5f6c6437ffde8bd8f840d678d20817a085 SHA1 83a21a670bd2a4804a9bc98810b53b4e653eeb7c SHA256 e3bf3b306894997f5602c6344a153f60d5e252bb099ac7fefee5b0a046509e13 size 106773
-MD5 dee80bc63b5724d41d0b5322ad6cfd29 ChangeLog 106773
-RMD160 40df0b5f6c6437ffde8bd8f840d678d20817a085 ChangeLog 106773
-SHA256 e3bf3b306894997f5602c6344a153f60d5e252bb099ac7fefee5b0a046509e13 ChangeLog 106773
+MISC ChangeLog 106997 RMD160 92ea56db6fe43f44e9795fd7731840e2dfdbbbf5 SHA1 2f874c709c640fd47f7c83819864d6626e428940 SHA256 11571c5792f7bbffd23a21a0930ee993736691f7c69e0273b68567b980749290 size 106997
+MD5 c299107820aa10bc08b72d113767b708 ChangeLog 106997
+RMD160 92ea56db6fe43f44e9795fd7731840e2dfdbbbf5 ChangeLog 106997
+SHA256 11571c5792f7bbffd23a21a0930ee993736691f7c69e0273b68567b980749290 ChangeLog 106997
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a size 162
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -480,3 +487,10 @@ SHA256 0b64499f68cfcd2d672e675da4c55660e7103edc2777017278e18623956f6b31 files/di
 MD5 1b28b078c09eed16bc8c543c362a64e3 files/digest-gcc-4.2.0_alpha20060506 259
 RMD160 2cb37976102306408170a1d67e5671fa294af4f9 files/digest-gcc-4.2.0_alpha20060506 259
 SHA256 8fb7f660176bf2bb4e4da6f43b7c17d4f8f44c7dcec1c81dae2066c58c43024f files/digest-gcc-4.2.0_alpha20060506 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEZWHc2+ySkm8kpY0RAs3iAJ483+gIpuJ9XAurWdopjxbFAdtBYACgxnqx
+N4iRYL5SQ6enuAl11eP7vCw=
+=mHk4
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/files/4.0.2/gcc-4.0.2-cross-compile.patch b/sys-devel/gcc/files/4.0.2/gcc-4.0.2-cross-compile.patch
index 523caa48a3c8..e14b57a3fdf4 100644
--- a/sys-devel/gcc/files/4.0.2/gcc-4.0.2-cross-compile.patch
+++ b/sys-devel/gcc/files/4.0.2/gcc-4.0.2-cross-compile.patch
@@ -24,9 +24,9 @@ http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
  	esac
 -elif test "x$TARGET_SYSTEM_ROOT" != x; then
 +elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
-         SYSTEM_HEADER_DIR=$build_system_header_dir
+         # This is just $(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR)
+         SYSTEM_HEADER_DIR='$(CROSS_SYSTEM_HEADER_DIR)'
  fi
- 
 --- gcc/configure.ac
 +++ gcc/configure.ac
 @@ -1717,7 +1717,7 @@ then
@@ -35,6 +35,6 @@ http://gcc.gnu.org/ml/gcc/2005-07/msg01195.html
  	esac
 -elif test "x$TARGET_SYSTEM_ROOT" != x; then
 +elif test "x$TARGET_SYSTEM_ROOT" != x -o $build != $host; then
-         SYSTEM_HEADER_DIR=$build_system_header_dir 
+         # This is just $(TARGET_SYSTEM_ROOT)$(NATIVE_SYSTEM_HEADER_DIR)
+         SYSTEM_HEADER_DIR='$(CROSS_SYSTEM_HEADER_DIR)'
  fi
-