summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWANG Xuerui <xen0n@gentoo.org>2022-05-10 11:54:56 +0800
committerWANG Xuerui <xen0n@gentoo.org>2022-05-10 18:15:01 +0800
commit33d1535f843a518418d4cc4488206ebad3c87d4c (patch)
tree02ea3c28c197959bb33313546f3af3e01e5ec9a7 /app-cdr
parentapp-cdr/cdrtools: lift symlinking of the build rules out of src_prepare (diff)
downloadgentoo-33d1535f843a518418d4cc4488206ebad3c87d4c.tar.gz
gentoo-33d1535f843a518418d4cc4488206ebad3c87d4c.tar.bz2
gentoo-33d1535f843a518418d4cc4488206ebad3c87d4c.zip
app-cdr/cdrtools: migrate the riscv build fix to unified helper
Also restoring proper grouping of related logic, previously split by the riscv snippet. See: https://bugs.gentoo.org/811375 See: https://github.com/gentoo/gentoo/pull/25410 Reviewed-by: Daniel Pielmeier <billie@gentoo.org> Signed-off-by: WANG Xuerui <xen0n@gentoo.org>
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild7
1 files changed, 4 insertions, 3 deletions
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
index d88e01cc9590..d035027a4c8f 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
@@ -93,9 +93,6 @@ src_prepare() {
cd "${S}"/RULES || die
local tcCC="$(tc-getCC)"
local tcCXX="$(tc-getCXX)"
- # fix RISC-V build err, bug 811375
- ln -s i586-linux-cc.rul riscv-linux-cc.rul || die
- ln -s i586-linux-cc.rul riscv64-linux-cc.rul || die
sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
rules1.top || die "sed rules1.top"
@@ -110,6 +107,10 @@ src_prepare() {
# Add support for arm64
symlink_build_rules aarch64_be
+ # fix RISC-V build err, bug 811375
+ symlink_build_rules riscv
+ symlink_build_rules riscv64
+
# Schily make setup.
cd "${S}"/DEFAULTS || die
local os=$(cdrtools_os)