commit: 440dd6f39522f63bf3e0678f5b8cfe9e97a15fff Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com> AuthorDate: Wed Apr 14 13:29:09 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Apr 15 06:38:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=440dd6f3
x11-misc/xtoolwait: fix build with -native-symlinks Closes: https://bugs.gentoo.org/726226 Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild index 386962ee976..379b2beb3fa 100644 --- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild +++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,23 +16,21 @@ KEYWORDS="amd64 ppc x86" RDEPEND=" x11-libs/libX11 x11-libs/libXext" -DEPEND="${RDEPEND} - x11-base/xorg-proto" +DEPEND="${RDEPEND}" BDEPEND=" app-text/rman - x11-misc/imake" + x11-base/xorg-proto + >=x11-misc/imake-1.0.8-r1" src_configure() { - xmkmf || die - sed -i \ - -e '/CC = /d' -e '/EXTRA_LDOPTIONS = /d' \ - Makefile || die + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die } src_compile() { emake \ CC="$(tc-getCC)" \ - CCOPTIONS="${CFLAGS}" \ + CDEBUGFLAGS="${CFLAGS}" \ EXTRA_LDOPTIONS="${LDFLAGS}" }
