diff options
Diffstat (limited to 'app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild')
| -rw-r--r-- | app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild index 086556458965..00968a87ae73 100644 --- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild +++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit fcaps multilib toolchain-funcs flag-o-matic gnuconfig +inherit fcaps toolchain-funcs flag-o-matic gnuconfig MY_P="${P/_alpha/a}" @@ -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 -riscv ~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" IUSE="acl caps nls unicode selinux" BDEPEND=" @@ -24,7 +24,6 @@ RDEPEND=" acl? ( virtual/acl ) caps? ( sys-libs/libcap ) nls? ( virtual/libintl ) - !app-cdr/cdrkit selinux? ( sec-policy/selinux-cdrecord ) " DEPEND=" @@ -42,7 +41,6 @@ FILECAPS=( cdrtools_os() { local os="linux" [[ ${CHOST} == *-darwin* ]] && os="mac-os10" - [[ ${CHOST} == *-freebsd* ]] && os="freebsd" echo "${os}" } @@ -51,12 +49,6 @@ src_prepare() { gnuconfig_update - # This fixes a clash with clone() on uclibc. Upstream isn't - # going to include this so let's try to carry it forward. - # Contact me if it needs updating. Bug #486782. - # Anthony G. Basile <blueness@gentoo.org>. - use elibc_uclibc && eapply "${FILESDIR}"/${PN}-fix-clone-uclibc.patch - # Remove profiled make files. find -name '*_p.mk' -delete || die "delete *_p.mk" @@ -86,8 +78,12 @@ src_prepare() { # Respect CC/CXX variables. cd "${S}"/RULES || die - local tcCC=$(tc-getCC) - local tcCXX=$(tc-getCXX) + local tcCC="$(tc-getCC)" + local tcCXX="$(tc-getCXX)" + # fix RISC-V build err, bug 811375 + ln -s i586-linux-cc.rul riscv-linux-cc.rul || die + ln -s i586-linux-cc.rul riscv64-linux-cc.rul || die + sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \ rules1.top || die "sed rules1.top" sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \ |