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

[Sergei Trofimovich]

commit:     78fc6e62d719bf8fd669ad951b1295a5e0141a17
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 07:09:39 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 07:10:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78fc6e62

sys-devel/gcc: fail if riscv32 patch does not exist

While at it fix patch name.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 sys-devel/gcc/gcc-10.2.0-r5.ebuild      | 5 ++++-
 sys-devel/gcc/gcc-10.3.0.ebuild         | 5 ++++-
 sys-devel/gcc/gcc-10.3.1_pre9999.ebuild | 4 +++-
 sys-devel/gcc/gcc-11.1.0.ebuild         | 5 ++++-
 sys-devel/gcc/gcc-11.1.1_pre9999.ebuild | 4 +++-
 sys-devel/gcc/gcc-12.0.0_pre9999.ebuild | 4 +++-
 6 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/sys-devel/gcc/gcc-10.2.0-r5.ebuild b/sys-devel/gcc/gcc-10.2.0-r5.ebuild
index 21baa1ac7b1..e349f2b531c 100644
--- a/sys-devel/gcc/gcc-10.2.0-r5.ebuild
+++ b/sys-devel/gcc/gcc-10.2.0-r5.ebuild
@@ -13,6 +13,9 @@ RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
 
 src_prepare() {
-	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
 	toolchain_src_prepare
 }

diff --git a/sys-devel/gcc/gcc-10.3.0.ebuild b/sys-devel/gcc/gcc-10.3.0.ebuild
index 8cb8a15d511..d262b1b0f2b 100644
--- a/sys-devel/gcc/gcc-10.3.0.ebuild
+++ b/sys-devel/gcc/gcc-10.3.0.ebuild
@@ -13,6 +13,9 @@ RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
 
 src_prepare() {
-	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
 	toolchain_src_prepare
 }

diff --git a/sys-devel/gcc/gcc-10.3.1_pre9999.ebuild b/sys-devel/gcc/gcc-10.3.1_pre9999.ebuild
index d15d241413c..b9f40e39b02 100644
--- a/sys-devel/gcc/gcc-10.3.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-10.3.1_pre9999.ebuild
@@ -22,7 +22,9 @@ src_prepare() {
 		rm -v "${WORKDIR}/patch/${p}" || die
 	done
 
-	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
 
 	toolchain_src_prepare
 }

diff --git a/sys-devel/gcc/gcc-11.1.0.ebuild b/sys-devel/gcc/gcc-11.1.0.ebuild
index 8cb8a15d511..8fe90739f9f 100644
--- a/sys-devel/gcc/gcc-11.1.0.ebuild
+++ b/sys-devel/gcc/gcc-11.1.0.ebuild
@@ -13,6 +13,9 @@ RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
 
 src_prepare() {
-	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/21_all_disable-riscv32-ABIs.patch" || die
+	fi
+
 	toolchain_src_prepare
 }

diff --git a/sys-devel/gcc/gcc-11.1.1_pre9999.ebuild b/sys-devel/gcc/gcc-11.1.1_pre9999.ebuild
index 1bce503b6a8..1d646044859 100644
--- a/sys-devel/gcc/gcc-11.1.1_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-11.1.1_pre9999.ebuild
@@ -22,7 +22,9 @@ src_prepare() {
 		rm -v "${WORKDIR}/patch/${p}" || die
 	done
 
-	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/21_all_disable-riscv32-ABIs.patch" || die
+	fi
 
 	toolchain_src_prepare
 }

diff --git a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
index 20155ba01b9..1b0bb53d40b 100644
--- a/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
+++ b/sys-devel/gcc/gcc-12.0.0_pre9999.ebuild
@@ -17,6 +17,8 @@ RDEPEND=""
 BDEPEND="${CATEGORY}/binutils"
 
 src_prepare() {
-	has_version '>=sys-libs/glibc-2.32-r1' && rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch"
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/21_all_disable-riscv32-ABIs.patch" || die
+	fi
 	toolchain_src_prepare
 }