commit: c59c5b64f3ae944c9226964164038e992c224443 Author: WANG Xuerui <xen0n <AT> gentoo <DOT> org> AuthorDate: Tue May 10 03:52:53 2022 +0000 Commit: WANG Xuerui <xen0n <AT> gentoo <DOT> org> CommitDate: Tue May 10 10:14:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c59c5b64
app-cdr/cdrtools: lift symlinking of the build rules out of src_prepare See: https://github.com/gentoo/gentoo/pull/25410 Reviewed-by: Daniel Pielmeier <billie <AT> gentoo.org> Signed-off-by: WANG Xuerui <xen0n <AT> gentoo.org> app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild index d57c022de7c1..d88e01cc9590 100644 --- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild +++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild @@ -44,6 +44,19 @@ cdrtools_os() { echo "${os}" } +symlink_build_rules() { + local cputype="$1" + pushd "${S}"/RULES > /dev/null || die + ln -sf i586-linux-cc.rul "${cputype}"-linux-cc.rul || die + ln -sf i586-linux-clang.rul "${cputype}"-linux-clang.rul || die + ln -sf i586-linux-clang32.rul "${cputype}"-linux-clang32.rul || die + ln -sf i586-linux-clang64.rul "${cputype}"-linux-clang64.rul || die + ln -sf i586-linux-gcc.rul "${cputype}"-linux-gcc.rul || die + ln -sf i586-linux-gcc32.rul "${cputype}"-linux-gcc32.rul || die + ln -sf i586-linux-gcc64.rul "${cputype}"-linux-gcc64.rul || die + popd > /dev/null || die +} + src_prepare() { default @@ -95,13 +108,7 @@ src_prepare() { rules.cnf || die "sed rules.cnf" # Add support for arm64 - ln -sf i586-linux-cc.rul aarch64_be-linux-cc.rul - ln -sf i586-linux-clang.rul aarch64_be-linux-clang.rul - ln -sf i586-linux-clang32.rul aarch64_be-linux-clang32.rul - ln -sf i586-linux-clang64.rul aarch64_be-linux-clang64.rul - ln -sf i586-linux-gcc.rul aarch64_be-linux-gcc.rul - ln -sf i586-linux-gcc32.rul aarch64_be-linux-gcc32.rul - ln -sf i586-linux-gcc64.rul aarch64_be-linux-gcc64.rul + symlink_build_rules aarch64_be # Schily make setup. cd "${S}"/DEFAULTS || die
