summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <sudinave@gmail.com>2021-04-14 06:34:22 -0400
committerJoonas Niilola <juippis@gentoo.org>2021-04-15 09:38:53 +0300
commit207500afcf649e5ac63c302d2c907c3514284f5f (patch)
tree8044e93e36c42bd3636f4386f0fc2110dd7e2800 /media-libs/nas
parentmedia-gfx/xli: fix build with -native-symlinks (diff)
downloadgentoo-207500afcf649e5ac63c302d2c907c3514284f5f.tar.gz
gentoo-207500afcf649e5ac63c302d2c907c3514284f5f.tar.bz2
gentoo-207500afcf649e5ac63c302d2c907c3514284f5f.zip
media-libs/nas: fix build with -native-symlinks
"World" removal on emake is to stop it from re-doing what xmkmf already did and call wrong commands in the process. Swapped DEPEND with BDEPEND to put imake in the right block. Closes: https://bugs.gentoo.org/720968 Signed-off-by: Ionen Wolkens <sudinave@gmail.com> Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'media-libs/nas')
-rw-r--r--media-libs/nas/nas-1.9.4-r2.ebuild10
1 files changed, 6 insertions, 4 deletions
diff --git a/media-libs/nas/nas-1.9.4-r2.ebuild b/media-libs/nas/nas-1.9.4-r2.ebuild
index 1b04016bd05c..513893a8cd31 100644
--- a/media-libs/nas/nas-1.9.4-r2.ebuild
+++ b/media-libs/nas/nas-1.9.4-r2.ebuild
@@ -24,13 +24,14 @@ RDEPEND="
x11-libs/libXmu
x11-libs/libXpm
>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
app-text/rman
sys-devel/bison
sys-devel/flex
x11-base/xorg-proto
x11-misc/gccmakedep
- x11-misc/imake"
+ >=x11-misc/imake-1.0.8-r1"
DOCS=( BUILDNOTES FAQ HISTORY README RELEASE TODO )
@@ -51,7 +52,8 @@ multilib_src_configure() {
pushd config || die
econf
popd || die
- xmkmf -a || die
+ CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+ IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
}
multilib_src_compile() {
@@ -82,7 +84,7 @@ multilib_src_compile() {
Makefile || die
fi
- emake "${emakeopts[@]}" World
+ emake "${emakeopts[@]}"
}
multilib_src_install() {