From 797f7f7c8100d087277eef031b671a9acb34f7fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ulc?= Date: Sun, 27 Sep 2020 12:19:42 +0200 Subject: [PATCH] app-accessibility/speech-tools: fixed calling ar and ranlib in 2.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/738880 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Miroslav Šulc --- app-accessibility/speech-tools/speech-tools-2.5.0.ebuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild index 184920c28003b..8a41ef4028445 100644 --- a/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild +++ b/app-accessibility/speech-tools/speech-tools-2.5.0.ebuild @@ -79,20 +79,24 @@ src_prepare() { src_configure() { local CONFIG=config/config.in + sed -i -e 's/@COMPILERTYPE@/gcc42/' ${CONFIG} || die + if use nas; then sed -i -e "s/#.*\(INCLUDE_MODULES += NAS_AUDIO\)/\1/" \ ${CONFIG} || die fi + if ! use X; then sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak || die fi + econf } src_compile() { emake -j1 CC="$(tc-getCC)" CXX="$(tc-getCXX)" CXX_OTHER_FLAGS="${CXXFLAGS}" CC_OTHER_FLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" + AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" LDFLAGS="${LDFLAGS}" } src_install() {