From 78fc6e62d719bf8fd669ad951b1295a5e0141a17 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 30 Apr 2021 08:09:39 +0100 Subject: 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 --- 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 21baa1ac7b19..e349f2b531cb 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 8cb8a15d5118..d262b1b0f2be 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 d15d241413c5..b9f40e39b02d 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 8cb8a15d5118..8fe90739f9f6 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 1bce503b6a8a..1d6460448597 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 20155ba01b9a..1b0bb53d40b5 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 } -- cgit v1.2.3-65-gdbad