commit: 8d84aa93208cea5c8681efd950a5b57f69ef9675 Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com> AuthorDate: Wed Apr 14 15:04:34 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Apr 15 06:38:59 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d84aa93
x11-wm/vtwm: fix build with -native-symlinks Also swapped DEPEND with BDEPEND to put imake in the right block. Closes: https://bugs.gentoo.org/726210 Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/20381 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> x11-wm/vtwm/vtwm-5.4.7-r2.ebuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild index e2c87e29d8c..67ac8de4a83 100644 --- a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild +++ b/x11-wm/vtwm/vtwm-5.4.7-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 @@ -20,12 +20,13 @@ RDEPEND="x11-libs/libX11 x11-libs/libXext x11-libs/libXpm rplay? ( media-sound/rplay )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" app-text/rman sys-devel/bison sys-devel/flex x11-base/xorg-proto - x11-misc/imake" + >=x11-misc/imake-1.0.8-r1" src_prepare() { eapply "${FILESDIR}"/${P}-do-not-rm.patch @@ -45,14 +46,14 @@ src_prepare() { } src_configure() { - xmkmf || die "xmkmf failed" - emake depend + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die "xmkmf failed" } src_compile() { emake \ - CC=$(tc-getCC) \ - CCOPTIONS="${CFLAGS}" \ + CC="$(tc-getCC)" \ + CDEBUGFLAGS="${CFLAGS}" \ EXTRA_LDOPTIONS="${LDFLAGS}" }
