diff options
| author |   Ionen Wolkens <sudinave@gmail.com> | 2021-04-14 06:08:34 -0400 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2021-04-15 09:38:53 +0300 |
| commit | 4f7dcc5da0c4434b1685fa22bb6b6657ea168697 (patch) | |
| tree | d760097858080586e5db0026051a0c1680d7ad04 /media-gfx | |
| parent | media-fonts/x11fonts-jmk: fix build with -native-symlinks (diff) | |
| download | gentoo-4f7dcc5da0c4434b1685fa22bb6b6657ea168697.tar.gz gentoo-4f7dcc5da0c4434b1685fa22bb6b6657ea168697.tar.bz2 gentoo-4f7dcc5da0c4434b1685fa22bb6b6657ea168697.zip | |
media-gfx/transfig: remove gcc wrapper, fix ld use
Wrapper allowed it to build (while keeping ld QA notice), but would
cause an infinite loop if users sets CC=gcc (bug #764506).
Switch to the more streamlined solution that >=imake-1.0.8-r1 allows.
Also swapped DEPEND with BDEPEND to put imake in the right block.
Closes: https://bugs.gentoo.org/764506
Signed-off-by: Ionen Wolkens <sudinave@gmail.com>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/transfig/transfig-3.2.5e-r1.ebuild | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild index e58370da17bc..dd86242cd42f 100644 --- a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild +++ b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild @@ -20,9 +20,10 @@ RDEPEND="x11-libs/libXpm virtual/jpeg media-libs/libpng x11-apps/rgb" -DEPEND="${RDEPEND} - x11-misc/imake - app-text/rman" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/rman + >=x11-misc/imake-1.0.8-r1" S=${WORKDIR}/${MY_P} @@ -61,11 +62,6 @@ sed_Imakefile() { src_prepare() { default - # Create wrapper for gcc, bug #720820 - printf '#!/bin/sh\n%s ${*}\n' "$(tc-getCC)" > "${T}"/gcc - chmod +x "${T}"/gcc - export PATH="${T}:${PATH}" - find . -type f -exec chmod a-x '{}' \; || die find . -name Makefile -delete || die @@ -75,10 +71,13 @@ src_prepare() { sed_Imakefile fig2dev/Imakefile fig2dev/dev/Imakefile } -src_compile() { - xmkmf || die "xmkmf failed" - emake Makefiles +src_configure() { + export IMAKECPP=${IMAKECPP:-$(tc-getCPP)} + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" xmkmf || die +} +src_compile() { + emake CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" Makefiles emake CC="$(tc-getCC)" AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" \ LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${CFLAGS}" \ USRLIBDIR="${EPREFIX}/usr/$(get_libdir)" |