Gentoo Archives: gentoo-musl

From: Felix Janda <felix.janda@××××××.de>
To: gentoo-musl@l.g.o
Subject: [gentoo-musl] [PATCH] sys-devel/gcc: Apply patches also when cross-compiling from glibc
Date: Sat, 09 Jan 2016 15:36:27
Message-Id: 20160109153351.GA1673@nyan
1 Fixes bug 563208
2 ---
3 sys-devel/gcc/Manifest | 8 ++++----
4 sys-devel/gcc/gcc-4.7.4-r99.ebuild | 2 +-
5 sys-devel/gcc/gcc-4.8.5-r99.ebuild | 2 +-
6 sys-devel/gcc/gcc-4.8.5-r999.ebuild | 2 +-
7 sys-devel/gcc/gcc-4.9.3-r99.ebuild | 2 +-
8 5 files changed, 8 insertions(+), 8 deletions(-)
9
10 diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
11 index 8b33ca2..245ca2d 100644
12 --- a/sys-devel/gcc/Manifest
13 +++ b/sys-devel/gcc/Manifest
14 @@ -33,8 +33,8 @@ DIST gcc-4.9.3-patches-1.2.tar.bz2 23657 SHA256 1eb0b19e9f048ba30b897154aa51d4c8
15 DIST gcc-4.9.3-piepatches-v0.6.3.tar.bz2 14388 SHA256 268fd94cf905c9a9b95a259378c54a50763d1e13cc833cb0fc84ba33f0da78c4 SHA512 7e08934c729d06b578c420dcc845cb5fe274cb3f1f6eea8ba83a5031f0ba5f2c811e6b8fe5c2a72682030a71bf4134fd0e0d151452145899a7ae0318ebaf058a WHIRLPOOL 8f8d20c70061cd446d7c39d0f638c15ffaa64bc1cabc0f14c3f3632c76e432a3c4794cdb33799cacee754530876543902f53bca4465fca7d51c73f07eded9fe3
16 DIST gcc-4.9.3-uclibc-patches-1.0.tar.bz2 2515 SHA256 dd19904d4ab005ef142056228f326e75b3d4d79b8056189a505129b5940a575c SHA512 825092620a3c554ef06219fd1152c3677f1456315563b9e65282a73096e75600389e93298ed76cad41ce3eeecc6a7009ca722585b93c04095bd2d0a06c4404e6 WHIRLPOOL 0c184a5cc74f80a61f354ee85bc5a0f5b44d93bc9fa2e1892fbfe899958cfa5263b8b72cc4f905bc69bd1cc90cf870a6056c4003ec493b815646a72a0fe2e44e
17 DIST gcc-4.9.3.tar.bz2 90006707 SHA256 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e SHA512 9ac57377a6975fc7adac704ec81355262b9f537def6955576753b87715470a20ee6a2a3144a79cc8fcba3443f7b44c7337d79d704b522d053f54f79aa6b442df WHIRLPOOL 085e4cc1825b031652cbe9e098671f761acfeca64c6cc9b8ad2a8961c13fcac9e02b4538b44dc38181a355266f2c55c99ce5a1bff3f2860b870285cf3f0e84a5
18 -EBUILD gcc-4.7.4-r99.ebuild 2035 SHA256 5a10cf2db3ccaceffab0e713d368617ccd02460518030c29bf57ee04402b2608 SHA512 15c13cfa122af2e50fcd6073e424e4e30086224f8a457e8450151a57b4cc4693d26eb6d26ba77d7275a12e72e58ea6b4eb896902085e08a287631c490f373728 WHIRLPOOL 2b8a04162c6c39babbd1cbefab77dbb9a27f75dbfdb8cd77c60a907db47a73ac124254123929cb228493c29e4d215afa37e5624a759131d6162c108dfc2ec9ff
19 -EBUILD gcc-4.8.5-r99.ebuild 2103 SHA256 6073e262ac4c0b8a08bdbef66dc5116dcfca216560098845d74d1209f6514d9c SHA512 41b4bb94e6c5105f244b90831ac9f8798352129510e18e67f9995b4540e588c26a203ec08b1bc756c41dcdf0fd6bb86b0bee04de1603481e1c2b7004306f5326 WHIRLPOOL 331bd4e7da435e8d9b836332f8be1da0fcf099da73cdec876f7465913c4bab6b3f4af1144960ca43479457de3ff4ce453c526cb287dcc1a55130f4433e8e42d4
20 -EBUILD gcc-4.8.5-r999.ebuild 2149 SHA256 b36c45c9cd2ac125ed720aa06d0fea461b5803b7ae06bb48b85ae32d9d9e1595 SHA512 fde52f943694e5d6f4225156c2822465ae195e3ec682c9bccccf4b6e8a7f492b4de20cb5c682480bbb4aa45177d93112f4c66ac63276196e610142e06e35fb5e WHIRLPOOL eac63fa16fe17e89204395e4b7baa912205fb70aee54d73968db5da115dc59ac9dd0b994e70d9d40e0fa348713869b25194dedf4ab64209578abae93891203c1
21 -EBUILD gcc-4.9.3-r99.ebuild 2159 SHA256 d81f4a03f023c88213d40a592491294eaf92df7678aee72edd2c37a3e4b05b28 SHA512 2a29e77649ea833b2103444ae3ed3fc00a96ff45fa7033fdfcf017515f5a46c562834db1538875c33315bea9b0a5971b40eb7f5c05561a57dacaea2b1255048c WHIRLPOOL 21ba0230e4b05e56e6c893eda08402c68a6240b48cb61e67306dba7cb952b03c53dc7afa500f2067ed56001c9d0fa2c81b8130ca944da40d5ae3e56dd6bb3e6e
22 +EBUILD gcc-4.7.4-r99.ebuild 2071 SHA256 f377102a20f4fa18305855de53b66e1b27af2e966f6b9c35fb1d43baccf02c24 SHA512 6b9bc932417d14d3ca1a31c75d2b3466ba8b8ab0205c1ac26828f43794b248c6280524a7eaf0deebda2bf53c14fa7e851c37e34156b42d58741b7bb0b19d18ca WHIRLPOOL f112d7a935c104cb5f9ddad08561da0af4766eb13a8ab74ef4a3dcc4c2638e7927a04dd984a15d2ae53359131115844398710b0129b0560717d2de84da5aaec0
23 +EBUILD gcc-4.8.5-r99.ebuild 2139 SHA256 4531cbe9549980d5df32bd76395dc874b8769a11621cbd39d2a2f28446b90284 SHA512 f23df7053432618579fbd40805f20cb2a6c3e853a50a942b1aff368f15f8b320206b5c32933ba1350382aef77c99570edfa1657d4631aaf17994bf71db340212 WHIRLPOOL 80f3f23614619d25caa013ea88d09cb1c722aea9d17cc9e6b139ae41ed8a84d9f73947911ae540be2da27140a19df5e237cd94ba2c112cc73ba2dd1392c54cec
24 +EBUILD gcc-4.8.5-r999.ebuild 2185 SHA256 979287614b304df1054bd5ce0f296f6ee1e7d7ed0cd8299d3810a379757d2145 SHA512 c12b551ecbe7e2ae29d19608b8c64fdbc3fc4cb6ac2fb8f95ec2f1a5a52f3dd89b7f3496375c4f22ff9fc4ac80a6503645d6cb7e045a8e6c6dd07278350b4c31 WHIRLPOOL 9616615a24bf1bbbf72e01d008c8b7635e77d8489a049e455e1cb167ae117926bf6284df220bbad7e253be7e62a5ecc09e3c31c189d6f3a6f568bd0654126806
25 +EBUILD gcc-4.9.3-r99.ebuild 2195 SHA256 6bbc9fb6e85d1cec054602a3af368f8b10c2f5ca8f7ddbdc17e07663283d5aa4 SHA512 934b06b2f421af49848f2cfc29e89c0f97f9e5a49d538313d8801c86c1da1871a294beefbb797681db010cfef788747ac75a9aee3e1091e6bd2d10465142569f WHIRLPOOL 5a1411b68a50d84e5878874a97126f9fd3c3b9fab58610687f3b035ce5102af7e6655e6ad549269f884c0c076a342dff299cbd40fa7d15bb0fc4bd04b7712f91
26 MISC metadata.xml 1910 SHA256 2f6c2f19316b90d4b829aab2dd6fb66319c158c0955e81533aba54b6c1af00d8 SHA512 b5144578028c73be85bff609538399e832a7205aba451374973b640f83c1e9fa6a6684bb6c26043912ad649e6ea3e4115621b9a84b157399d13027a1f514f947 WHIRLPOOL 29e0ec175732d52d13345d22ae73711b394af62eb852e0a997b6a656834ad60e6be5fdf27ba174ed75310912dd730950be7966e7a8ca038f9f5686744ccef888
27 diff --git a/sys-devel/gcc/gcc-4.7.4-r99.ebuild b/sys-devel/gcc/gcc-4.7.4-r99.ebuild
28 index ab11809..2839a19 100644
29 --- a/sys-devel/gcc/gcc-4.7.4-r99.ebuild
30 +++ b/sys-devel/gcc/gcc-4.7.4-r99.ebuild
31 @@ -47,7 +47,7 @@ src_prepare() {
32
33 toolchain_src_prepare
34
35 - if use elibc_musl; then
36 + if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then
37 cd "${S}"
38 sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
39 mv libstdc\+\+-v3/config/os/gnu-linux libstdc\+\+-v3/config/os/gnu-linux.org
40 diff --git a/sys-devel/gcc/gcc-4.8.5-r99.ebuild b/sys-devel/gcc/gcc-4.8.5-r99.ebuild
41 index ee05a56..1a16304 100644
42 --- a/sys-devel/gcc/gcc-4.8.5-r99.ebuild
43 +++ b/sys-devel/gcc/gcc-4.8.5-r99.ebuild
44 @@ -44,7 +44,7 @@ src_prepare() {
45
46 toolchain_src_prepare
47
48 - if use elibc_musl; then
49 + if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then
50 cd "${S}"
51 sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
52 mv libstdc\+\+-v3/config/os/gnu-linux libstdc\+\+-v3/config/os/gnu-linux.org
53 diff --git a/sys-devel/gcc/gcc-4.8.5-r999.ebuild b/sys-devel/gcc/gcc-4.8.5-r999.ebuild
54 index 2ff0721..13e1515 100644
55 --- a/sys-devel/gcc/gcc-4.8.5-r999.ebuild
56 +++ b/sys-devel/gcc/gcc-4.8.5-r999.ebuild
57 @@ -44,7 +44,7 @@ src_prepare() {
58
59 toolchain_src_prepare
60
61 - if use elibc_musl; then
62 + if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then
63 cd "${S}"
64 sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
65 mv libstdc\+\+-v3/config/os/gnu-linux libstdc\+\+-v3/config/os/gnu-linux.org
66 diff --git a/sys-devel/gcc/gcc-4.9.3-r99.ebuild b/sys-devel/gcc/gcc-4.9.3-r99.ebuild
67 index 6fa951c..806fa20 100644
68 --- a/sys-devel/gcc/gcc-4.9.3-r99.ebuild
69 +++ b/sys-devel/gcc/gcc-4.9.3-r99.ebuild
70 @@ -44,7 +44,7 @@ src_prepare() {
71
72 toolchain_src_prepare
73
74 - if use elibc_musl; then
75 + if use elibc_musl || [[ ${CATEGORY} = cross-*-musl ]]; then
76 cd "${S}"
77 sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
78 mv libstdc\+\+-v3/config/os/gnu-linux libstdc\+\+-v3/config/os/gnu-linux.org
79 --
80 2.4.10

Replies