From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 436BB158090 for ; Tue, 10 May 2022 10:16:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6281E0938; Tue, 10 May 2022 10:16:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C8E03E0938 for ; Tue, 10 May 2022 10:16:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BCCA63411C9 for ; Tue, 10 May 2022 10:16:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4B051D3 for ; Tue, 10 May 2022 10:16:08 +0000 (UTC) From: "WANG Xuerui" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "WANG Xuerui" Message-ID: <1652177673.c59c5b64f3ae944c9226964164038e992c224443.xen0n@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-cdr/cdrtools/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild X-VCS-Directories: app-cdr/cdrtools/ X-VCS-Committer: xen0n X-VCS-Committer-Name: WANG Xuerui X-VCS-Revision: c59c5b64f3ae944c9226964164038e992c224443 X-VCS-Branch: master Date: Tue, 10 May 2022 10:16:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 00aa9a3b-31fb-4082-b9b0-1b1150ec84c2 X-Archives-Hash: e821bed8f4bb0fdffddaf768529acfa4 commit: c59c5b64f3ae944c9226964164038e992c224443 Author: WANG Xuerui gentoo org> AuthorDate: Tue May 10 03:52:53 2022 +0000 Commit: WANG Xuerui gentoo 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 gentoo.org> Signed-off-by: WANG Xuerui 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