commit: 64f296e242dae176d0e5cf512d05d919f82ea90f Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> AuthorDate: Thu Feb 11 20:05:17 2021 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Fri Feb 12 13:44:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64f296e2
net-misc/liveice: Apply gcc-10 workaround * Dead upstream Closes: https://bugs.gentoo.org/708642 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> net-misc/liveice/files/liveice-2000530-build.patch | 8 ++++---- net-misc/liveice/liveice-2000530-r2.ebuild | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/net-misc/liveice/files/liveice-2000530-build.patch b/net-misc/liveice/files/liveice-2000530-build.patch index 14ab084c3d0..e736075c471 100644 --- a/net-misc/liveice/files/liveice-2000530-build.patch +++ b/net-misc/liveice/files/liveice-2000530-build.patch @@ -1,5 +1,5 @@ ---- liveice/configure.in -+++ liveice/configure.in +--- a/configure.in ++++ b/configure.in @@ -39,6 +39,7 @@ dnl Replace `main' with a function in -lresolv: @@ -8,8 +8,8 @@ dnl Checks for header files. ---- liveice/Makefile.in -+++ liveice/Makefile.in +--- a/Makefile.in ++++ b/Makefile.in @@ -1,6 +1,6 @@ CC = @CC@ CFLAGS = @CFLAGS@ diff --git a/net-misc/liveice/liveice-2000530-r2.ebuild b/net-misc/liveice/liveice-2000530-r2.ebuild index 9b714278e0a..cc73e827d6a 100644 --- a/net-misc/liveice/liveice-2000530-r2.ebuild +++ b/net-misc/liveice/liveice-2000530-r2.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools toolchain-funcs +inherit autotools flag-o-matic toolchain-funcs DESCRIPTION="Live Source Client For IceCast" HOMEPAGE="http://star.arm.ac.uk/~spm/software/liveice.html"; @@ -13,15 +13,13 @@ LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 x86" -RDEPEND="media-sound/lame +RDEPEND=" + media-sound/lame media-sound/mpg123" -DEPEND="" +DEPEND="${RDEPEND}" S="${WORKDIR}/${PN}" - -PATCHES=( - "${FILESDIR}/${P}-build.patch" -) +PATCHES=( "${FILESDIR}"/${P}-build.patch ) src_prepare() { default @@ -29,7 +27,12 @@ src_prepare() { tc-export CC } +src_configure() { + append-flags -fcommon + default +} + src_install() { dobin liveice - dodoc liveice.cfg README.liveice README.quickstart README_new_mixer.txt Changes.txt + dodoc liveice.cfg README.{liveice,quickstart} README_new_mixer.txt Changes.txt }
