| 1 |
commit: 7138ee0fe68cac7adf083255541cb18b32fbf688 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 28 11:05:29 2021 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jul 28 11:27:57 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7138ee0f |
| 7 |
|
| 8 |
app-cdr/cdrtools: keyword for -riscv |
| 9 |
|
| 10 |
Uses a byzantine "build system" (i.e. a massive pile of makefiles) which |
| 11 |
we already have to patch extensively to play nicely with Gentoo |
| 12 |
conventions, and which has made it a major pain in the neck for me when |
| 13 |
I tried to figure out why it takes a different path on rv64 than on |
| 14 |
amd64 (and presumably other already-supported arches). Anyway, what |
| 15 |
happens here is: |
| 16 |
- while trying to compile align_test, make calls 'makedepend' rather |
| 17 |
than 'gcc -M' to generate dependencies. This doesn't work correctly |
| 18 |
in our case for clean installs (makedepend cannot find |
| 19 |
include/schily), resulting in a .d file containing nothing but a 'do |
| 20 |
not delete' comment |
| 21 |
- the scripts attempt extract of the name of the compiler which is to |
| 22 |
be used to build align_test from the .d file, and with the file being |
| 23 |
empty end up using an empty string instead; |
| 24 |
- align_test is not compiled -> align.h is not generated -> everything |
| 25 |
falls over. |
| 26 |
|
| 27 |
Nb. this is unlikely to be fixed upstream because standalone cdrtools |
| 28 |
have been deprecated in favour of schily-tools since at least 2018 - see |
| 29 |
Bug #672060. |
| 30 |
|
| 31 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 32 |
|
| 33 |
app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild | 2 +- |
| 34 |
app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild | 2 +- |
| 35 |
app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild | 2 +- |
| 36 |
profiles/arch/riscv/package.use.mask | 4 ++++ |
| 37 |
4 files changed, 7 insertions(+), 3 deletions(-) |
| 38 |
|
| 39 |
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild |
| 40 |
index 5ff3221ef76..ebb1b641b3f 100644 |
| 41 |
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild |
| 42 |
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild |
| 43 |
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$ |
| 44 |
|
| 45 |
LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" |
| 46 |
SLOT="0" |
| 47 |
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" |
| 48 |
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" |
| 49 |
IUSE="acl caps nls unicode selinux" |
| 50 |
|
| 51 |
BDEPEND=" |
| 52 |
|
| 53 |
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild |
| 54 |
index fddb123d5e8..08655645896 100644 |
| 55 |
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild |
| 56 |
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild |
| 57 |
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$ |
| 58 |
|
| 59 |
LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" |
| 60 |
SLOT="0" |
| 61 |
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" |
| 62 |
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" |
| 63 |
IUSE="acl caps nls unicode selinux" |
| 64 |
|
| 65 |
BDEPEND=" |
| 66 |
|
| 67 |
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild |
| 68 |
index f11ca585ee0..7a64693f19e 100644 |
| 69 |
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild |
| 70 |
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild |
| 71 |
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$ |
| 72 |
|
| 73 |
LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" |
| 74 |
SLOT="0" |
| 75 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" |
| 76 |
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" |
| 77 |
IUSE="acl caps nls unicode" |
| 78 |
|
| 79 |
RDEPEND="acl? ( virtual/acl ) |
| 80 |
|
| 81 |
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask |
| 82 |
index 0913c07249a..dfdaca208e6 100644 |
| 83 |
--- a/profiles/arch/riscv/package.use.mask |
| 84 |
+++ b/profiles/arch/riscv/package.use.mask |
| 85 |
@@ -1,6 +1,10 @@ |
| 86 |
# Copyright 2019-2021 Gentoo Authors |
| 87 |
# Distributed under the terms of the GNU General Public License v2 |
| 88 |
|
| 89 |
+# Marek Szuba <marecki@g.o> (2021-07-28) |
| 90 |
+# app-cdr/cdrtools fails to compile on riscv |
| 91 |
+dev-util/catalyst iso |
| 92 |
+ |
| 93 |
# Yixun Lan <dlan@g.o> (2021-07-27) |
| 94 |
# depend on sci-physics/bullet, media-libs/libv4l, media-libs/libsdl2 |
| 95 |
# which not keyworded |
Archives