From 8d69da3a32e772270357969d8d7beffefea31cd0 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 14 Apr 2021 02:41:12 -0400 Subject: [PATCH] app-office/magicpoint: fix build with -native-symlinks wrt bug #729526 with clang/llvm toolchain, it now gets past ld/gcc missing but will fail due to traditional cpp. Can workaround with a gcc exception: IMAKECPP=cpp Bug: https://bugs.gentoo.org/729526 Signed-off-by: Ionen Wolkens Signed-off-by: Joonas Niilola --- .../magicpoint-1.13a_p20121015-r1.ebuild | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild index c72a1f5b57441..0ecfc29466a76 100644 --- a/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.ebuild +++ b/app-office/magicpoint/magicpoint-1.13a_p20121015-r1.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=5 @@ -43,7 +43,7 @@ DEPEND="${COMMON_DEPEND} x11-base/xorg-proto x11-libs/libxkbfile app-text/rman - x11-misc/imake" + >=x11-misc/imake-1.0.8-r1" RDEPEND="${COMMON_DEPEND} contrib? ( dev-lang/perl ) nls? ( sys-devel/gettext ) @@ -97,16 +97,21 @@ src_configure() { --disable-freetype \ --x-libraries=/usr/lib/X11 \ --x-includes=/usr/include/X11 + + export IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" xmkmf || die } src_compile() { - xmkmf || die # no parallel build possible anywhere - emake -j1 Makefiles + emake -j1 Makefiles \ + CC="$(tc-getBUILD_CC)" \ + LD="$(tc-getLD)" - tc-export CC emake -j1 \ - CC="${CC}" \ + AR="$(tc-getAR) cq" \ + CC="$(tc-getCC)" \ + RANLIB="$(tc-getRANLIB)" \ CDEBUGFLAGS="${CFLAGS}" \ LOCAL_LDFLAGS="${LDFLAGS}" \ BINDIR=/usr/bin \