From 41c51365112a65e3638e3d8469f20584419424b0 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 14 Apr 2021 02:10:08 -0400 Subject: app-misc/oneko: fix build with -native-symlinks ebuild used an ld wrapper to try to work around this, but while this removed the QA notice it'd still fail on gcc (bug #729856). Wrapper could also cause an infinite loop if user sets LD=ld. Closes: https://bugs.gentoo.org/729856 Signed-off-by: Ionen Wolkens Signed-off-by: Joonas Niilola --- app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild index 262843e5b3d9..6e1677c1aeee 100644 --- a/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild +++ b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild @@ -28,7 +28,7 @@ DEPEND=" BDEPEND=" app-text/rman x11-misc/gccmakedep - x11-misc/imake + >=x11-misc/imake-1.0.8-r1 " PATCHES=( "${FILESDIR}"/${P/_p*}-include.patch @@ -41,20 +41,17 @@ src_prepare() { done default - - printf '#!/bin/sh\n%s ${*}\n' "$(tc-getLD)" > "${T}"/ld - chmod +x "${T}"/ld - export PATH="${T}:${PATH}" } src_configure() { - xmkmf -a || die + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die } src_compile() { emake \ CC="$(tc-getCC)" \ - CCOPTIONS="${CFLAGS}" \ + CDEBUGFLAGS="${CFLAGS}" \ EXTRA_LDOPTIONS="${LDFLAGS}" } -- cgit v1.2.3-65-gdbad