[gentoo-commits] proj/musl:master commit in: sys-devel/gcc/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/musl:master commit in: sys-devel/gcc/
Date: Wed, 17 Nov 2021 11:47:32 +0000 (UTC)	[thread overview]
Message-ID: <1637149599.fab8f488624903d1f9e5c59db3063f9e35879eda.sam@gentoo> (raw)

commit:     fab8f488624903d1f9e5c59db3063f9e35879eda
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 17 11:46:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 17 11:46:39 2021 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=fab8f488

sys-devel/gcc: use new musl patchset tarballs (no functional changes)

Patches are identical to before. This is in preparation for
moving GCC to ::gentoo from ::musl.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-devel/gcc/Manifest             |  3 +++
 sys-devel/gcc/gcc-10.3.0-r2.ebuild | 14 +-------------
 sys-devel/gcc/gcc-10.3.0-r3.ebuild | 14 +-------------
 sys-devel/gcc/gcc-11.1.0-r1.ebuild | 14 +-------------
 sys-devel/gcc/gcc-11.2.0.ebuild    | 14 +-------------
 5 files changed, 7 insertions(+), 52 deletions(-)

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 63ae0c00..2abd45e1 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,6 +1,9 @@
+DIST gcc-10.3.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-10.3.0-patches-3.tar.bz2 18935 BLAKE2B 13eaf1e055b5b63069aed1575ed93f6bc822b5e3f2181ddfc88f4e7ff801f58997cd131b2efd79b90469b1f861db994feb2adcaecacf165442078f76e233fd9a SHA512 c3d6a6f32863cc0ff7c877314ff0c00a892e473f64d16b82d46b4a77aa97c3e7a575492d27f0d423acb2621c86c9a49bca0e26e45bda9e697495444fcac85084
 DIST gcc-10.3.0.tar.xz 76692288 BLAKE2B ac7898f5eb8a7c5f151a526d1bb38913a68b50a65e4d010ac09fa20b6c801c671c790d780f23ccb8e4ecdfc686f4aa588082ccc9eb5c80c7b0e30788f824c1eb SHA512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86
+DIST gcc-11.1.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-11.1.0-patches-2.tar.bz2 18492 BLAKE2B 37ffb2b2a92287c434d3730772b73b88926788db8b609611447318a28fd43963fa04ee664bb1c83815ee80742457ab703f7bc2d1e6d700e342760b1d9cd13867 SHA512 62297a37b0f1ff48858c59f761291f0fc4efe14bd471d53763899c2f272cc21764d4521682219a57857118e846766dcb9e24646f749d735acd58bb2d7b8b05d6
 DIST gcc-11.1.0.tar.xz 78877216 BLAKE2B fe617e776b0270d11adea21b5c37d889de90865c19ab82d1c37bbd5c5b9c583a98c174606c4f893ca4950a4233e2a58aae93ad6aa7ad33d4e78a31c72371c1ed SHA512 fd6bba0f67ff48069d03073d1a9b5e896383b1cfc9dde008e868e60a9ec5014a837d56af0ecbf467b3fb9b37ec74a676e819a18b44393a0a3c4280175b5d7ad8
+DIST gcc-11.2.0-musl-patches-1.tar.bz2 2999 BLAKE2B 3e36bbf2f93fdce15e20f807fa262f7a7abbde85b6f6b4e1383f6eccd8a53d876687d56cde83a80cde8a50e15bec407a1212aa0c85520892563e3d5ef7aaca98 SHA512 21483912a7b152f27db82d837a4cf91f2552d5fe238702aeca0c0dd8c7d3695bc70d8794c94a19106df28e053baf14c38433ca8e38e849082b76273cb51f2384
 DIST gcc-11.2.0-patches-1.tar.bz2 11537 BLAKE2B 9dd791ada244c9b70b8b99f9f305a688c248134715ed1b26d406e53b114983faae6873cdc521497164388d24d5f61c199e98df146bc02f5578e877295bcf5c82 SHA512 6539efc60c656d0798a5896dc1b944ed69914b815102c7a1c10bdba4ef935abd326b01309f38316e121f1ed90ceb2abcaf65df6af116892daad829ac2623cefc
 DIST gcc-11.2.0.tar.xz 80888824 BLAKE2B 69b61234ac436edfea2933df68c434a2ce7aa4454ef4da573e82587e1a42dc420189e949cfdadaf4cb37fc0de9674822210a95b77ff03aca0dbedfe67df19cc6 SHA512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf

diff --git a/sys-devel/gcc/gcc-10.3.0-r2.ebuild b/sys-devel/gcc/gcc-10.3.0-r2.ebuild
index 7dec59f7..42fc9c2b 100644
--- a/sys-devel/gcc/gcc-10.3.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-10.3.0-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PATCH_VER="3"
-
+MUSL_VER="1"
 inherit toolchain
 
 KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
@@ -15,17 +15,5 @@ BDEPEND="${CATEGORY}/binutils"
 src_prepare() {
 	toolchain_src_prepare
 
-	if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then
-		eapply "${FILESDIR}"/10.1.0/cpu_indicator.patch
-		eapply "${FILESDIR}"/7.1.0/posix_memalign.patch
-		case $(tc-arch) in
-			amd64|arm64|ppc64) eapply "${FILESDIR}"/9.3.0/gcc-pure64.patch ;;
-		esac
-	fi
-
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		eapply "${FILESDIR}"/gcc-6.1-musl-libssp.patch
-	fi
-
 	eapply_user
 }

diff --git a/sys-devel/gcc/gcc-10.3.0-r3.ebuild b/sys-devel/gcc/gcc-10.3.0-r3.ebuild
index 60b7cbc2..308d4525 100644
--- a/sys-devel/gcc/gcc-10.3.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-10.3.0-r3.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PATCH_VER="3"
-
+MUSL_VER="1"
 inherit toolchain
 
 KEYWORDS="ppc x86"
@@ -15,17 +15,5 @@ BDEPEND="${CATEGORY}/binutils"
 src_prepare() {
 	toolchain_src_prepare
 
-	if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then
-		eapply "${FILESDIR}"/10.1.0/cpu_indicator.patch
-		eapply "${FILESDIR}"/7.1.0/posix_memalign.patch
-		case $(tc-arch) in
-			amd64|arm64|ppc64) eapply "${FILESDIR}"/9.3.0/gcc-pure64.patch ;;
-		esac
-	fi
-
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		eapply "${FILESDIR}"/gcc-6.1-musl-libssp.patch
-	fi
-
 	eapply_user
 }

diff --git a/sys-devel/gcc/gcc-11.1.0-r1.ebuild b/sys-devel/gcc/gcc-11.1.0-r1.ebuild
index 5b6db153..a35a711d 100644
--- a/sys-devel/gcc/gcc-11.1.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-11.1.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PATCH_VER="2"
-
+MUSL_VER="1"
 inherit toolchain
 
 KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
@@ -19,17 +19,5 @@ src_prepare() {
 
 	toolchain_src_prepare
 
-	if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then
-		eapply "${FILESDIR}"/10.1.0/cpu_indicator.patch
-		eapply "${FILESDIR}"/7.1.0/posix_memalign.patch
-		case $(tc-arch) in
-			amd64|arm64|ppc64) eapply "${FILESDIR}"/9.3.0/gcc-pure64.patch ;;
-		esac
-	fi
-
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		eapply "${FILESDIR}"/gcc-6.1-musl-libssp.patch
-	fi
-
 	eapply_user
 }

diff --git a/sys-devel/gcc/gcc-11.2.0.ebuild b/sys-devel/gcc/gcc-11.2.0.ebuild
index 48c41838..a2abf7bd 100644
--- a/sys-devel/gcc/gcc-11.2.0.ebuild
+++ b/sys-devel/gcc/gcc-11.2.0.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PATCH_VER="1"
-
+MUSL_VER="1"
 inherit toolchain
 
 KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
@@ -15,17 +15,5 @@ BDEPEND="${CATEGORY}/binutils"
 src_prepare() {
 	toolchain_src_prepare
 
-	if use elibc_musl || [[ ${CATEGORY} = cross-*-musl* ]]; then
-		eapply "${FILESDIR}"/10.1.0/cpu_indicator.patch
-		eapply "${FILESDIR}"/7.1.0/posix_memalign.patch
-		case $(tc-arch) in
-			amd64|arm64|ppc64) eapply "${FILESDIR}"/9.3.0/gcc-pure64.patch ;;
-		esac
-	fi
-
-	if [[ ${CATEGORY} != cross-* ]] ; then
-		eapply "${FILESDIR}"/gcc-6.1-musl-libssp.patch
-	fi
-
 	eapply_user
 }

next             reply	other threads:[~2021-11-17 11:47 UTC|newest]

Thread overview: 99+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-17 11:47 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-10-30  1:12 [gentoo-commits] proj/musl:master commit in: sys-devel/gcc/ Jory Pratt
2021-09-23 22:19 Jory Pratt
2021-09-07 18:38 Jory Pratt
2021-07-25 20:03 Jory Pratt
2021-07-06 15:48 Jory Pratt
2021-06-23 16:40 Jory Pratt
2021-05-27 12:50 Jory Pratt
2020-12-30 15:59 Jory Pratt
2020-11-08 18:24 Jory Pratt
2020-09-07 14:49 Jory Pratt
2020-08-24  1:34 Jory Pratt
2020-06-12  3:02 Jory Pratt
2020-05-04  2:05 Jory Pratt
2020-05-04  0:32 Anthony G. Basile
2020-04-12 18:47 Jory Pratt
2020-03-22  3:13 Jory Pratt
2020-02-26  3:51 Jory Pratt
2020-01-30  8:50 Georgy Yakovlev
2020-01-30  7:42 Georgy Yakovlev
2020-01-06  4:41 Jory Pratt
2019-11-24  1:32 Anthony G. Basile
2019-11-08 15:18 Jory Pratt
2019-11-06 22:40 Jory Pratt
2019-10-21 12:06 Jory Pratt
2019-09-23  5:28 Jory Pratt
2019-09-03 16:47 Jory Pratt
2019-06-19 19:11 Jory Pratt
2019-05-20 21:14 Jory Pratt
2019-05-20 15:18 Anthony G. Basile
2019-05-05 18:43 Jory Pratt
2019-05-04 17:50 Jory Pratt
2019-04-14 21:13 Anthony G. Basile
2019-04-13 21:42 Anthony G. Basile
2019-04-13 19:47 Anthony G. Basile
2019-02-24 16:56 Anthony G. Basile
2019-02-24 13:48 Anthony G. Basile
2019-01-25 12:37 Anthony G. Basile
2019-01-25 12:37 Anthony G. Basile
2018-10-29 11:39 Anthony G. Basile
2018-10-29 11:39 Anthony G. Basile
2018-09-20 23:43 Anthony G. Basile
2018-09-20 23:37 Anthony G. Basile
2018-08-03 15:59 Anthony G. Basile
2018-06-20  0:20 Anthony G. Basile
2018-06-19 12:56 Jory Pratt
2018-06-17  9:43 Anthony G. Basile
2018-05-19 19:23 Aric Belsito
2018-05-17 19:41 Aric Belsito
2018-05-17 18:15 Aric Belsito
2018-05-07 19:21 Aric Belsito
2018-05-05 12:56 Aric Belsito
2018-05-03 18:35 Aric Belsito
2018-04-14 17:41 Aric Belsito
2018-03-11 20:47 Aric Belsito
2018-03-04 16:57 Anthony G. Basile
2018-01-25 20:15 Aric Belsito
2018-01-25 19:57 Aric Belsito
2018-01-16  4:55 Aric Belsito
2018-01-12  8:53 Anthony G. Basile
2018-01-06 22:50 Aric Belsito
2018-01-06 22:34 Aric Belsito
2018-01-03 18:43 Aric Belsito
2017-12-15  0:16 Aric Belsito
2017-12-12 22:24 Anthony G. Basile
2017-11-29 20:41 Aric Belsito
2017-11-20  1:03 Anthony G. Basile
2017-10-09 20:50 Anthony G. Basile
2017-09-03 20:54 Anthony G. Basile
2017-08-24  0:16 Jory Pratt
2017-08-07 17:49 Aric Belsito
2017-05-08 20:55 Aric Belsito
2017-05-05 22:29 Aric Belsito
2017-04-17 23:16 Aric Belsito
2017-04-17 22:01 Aric Belsito
2017-02-03  0:04 Aric Belsito
2016-12-29 19:34 Aric Belsito
2016-09-20  9:27 Anthony G. Basile
2016-05-04 23:31 Anthony G. Basile
2016-05-04 19:48 Anthony G. Basile
2016-05-04 19:31 Anthony G. Basile
2016-05-03 10:12 Anthony G. Basile
2016-05-03  8:44 Anthony G. Basile
2016-02-14  1:13 Anthony G. Basile
2016-02-14  1:13 Anthony G. Basile
2016-02-05 12:09 Anthony G. Basile
2016-02-05 12:09 Anthony G. Basile
2016-01-29 20:22 Anthony G. Basile
2016-01-25 22:38 Anthony G. Basile
2015-10-07 15:38 Anthony G. Basile
2015-10-03 18:14 Anthony G. Basile
2015-10-03 18:10 Anthony G. Basile
2015-10-02 23:18 Anthony G. Basile
2015-09-09  0:32 Anthony G. Basile
2015-09-06 22:58 Anthony G. Basile
2015-09-06 22:58 Anthony G. Basile
2015-09-06 22:58 Anthony G. Basile
2015-08-30 15:29 Anthony G. Basile
2015-07-18  0:14 Anthony G. Basile

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:63ae0c0 dfblob:2abd45e dfblob:7dec59f dfblob:42fc9c2
dfblob:60b7cbc dfblob:308d452 dfblob:5b6db15 dfblob:a35a711
dfblob:48c4183 dfblob:a2abf7b )
 OR (
bs:"[gentoo-commits] proj/musl:master commit in: sys-devel/gcc/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1637149599.fab8f488624903d1f9e5c59db3063f9e35879eda.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox