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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 37FD3139337 for ; Wed, 28 Jul 2021 11:28:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22519E0901; Wed, 28 Jul 2021 11:28:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EC833E0901 for ; Wed, 28 Jul 2021 11:28:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D7896342E09 for ; Wed, 28 Jul 2021 11:28:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0135584F for ; Wed, 28 Jul 2021 11:28:45 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1627471677.7138ee0fe68cac7adf083255541cb18b32fbf688.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/arch/riscv/, app-cdr/cdrtools/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild profiles/arch/riscv/package.use.mask X-VCS-Directories: app-cdr/cdrtools/ profiles/arch/riscv/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 7138ee0fe68cac7adf083255541cb18b32fbf688 X-VCS-Branch: master Date: Wed, 28 Jul 2021 11:28:45 +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: 9a9f412c-abb9-4e5e-9c56-32f6c0d3f476 X-Archives-Hash: 9a172a71ae360a3870fe93d3197bbbd7 commit: 7138ee0fe68cac7adf083255541cb18b32fbf688 Author: Marek Szuba gentoo org> AuthorDate: Wed Jul 28 11:05:29 2021 +0000 Commit: Marek Szuba gentoo org> CommitDate: Wed Jul 28 11:27:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7138ee0f app-cdr/cdrtools: keyword for -riscv Uses a byzantine "build system" (i.e. a massive pile of makefiles) which we already have to patch extensively to play nicely with Gentoo conventions, and which has made it a major pain in the neck for me when I tried to figure out why it takes a different path on rv64 than on amd64 (and presumably other already-supported arches). Anyway, what happens here is: - while trying to compile align_test, make calls 'makedepend' rather than 'gcc -M' to generate dependencies. This doesn't work correctly in our case for clean installs (makedepend cannot find include/schily), resulting in a .d file containing nothing but a 'do not delete' comment - the scripts attempt extract of the name of the compiler which is to be used to build align_test from the .d file, and with the file being empty end up using an empty string instead; - align_test is not compiled -> align.h is not generated -> everything falls over. Nb. this is unlikely to be fixed upstream because standalone cdrtools have been deprecated in favour of schily-tools since at least 2018 - see Bug #672060. Signed-off-by: Marek Szuba gentoo.org> app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild | 2 +- app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild | 2 +- app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild | 2 +- profiles/arch/riscv/package.use.mask | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild index 5ff3221ef76..ebb1b641b3f 100644 --- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild +++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$ LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="acl caps nls unicode selinux" BDEPEND=" diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild index fddb123d5e8..08655645896 100644 --- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild +++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$ LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="acl caps nls unicode selinux" BDEPEND=" diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild index f11ca585ee0..7a64693f19e 100644 --- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild +++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$ LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="acl caps nls unicode" RDEPEND="acl? ( virtual/acl ) diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask index 0913c07249a..dfdaca208e6 100644 --- a/profiles/arch/riscv/package.use.mask +++ b/profiles/arch/riscv/package.use.mask @@ -1,6 +1,10 @@ # Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Marek Szuba (2021-07-28) +# app-cdr/cdrtools fails to compile on riscv +dev-util/catalyst iso + # Yixun Lan (2021-07-27) # depend on sci-physics/bullet, media-libs/libv4l, media-libs/libsdl2 # which not keyworded