commit: 7138ee0fe68cac7adf083255541cb18b32fbf688
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 28 11:05:29 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> 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 <marecki <AT> 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 <[email protected]> (2021-07-28)
+# app-cdr/cdrtools fails to compile on riscv
+dev-util/catalyst iso
+
# Yixun Lan <[email protected]> (2021-07-27)
# depend on sci-physics/bullet, media-libs/libv4l, media-libs/libsdl2
# which not keyworded
