From 15acb181d32bfdec6a75baa5430c789421253b3e Mon Sep 17 00:00:00 2001 From: Stephanie Fu Date: Mon, 16 Jan 2017 15:03:49 -0600 Subject: [PATCH] espeak: builds on x86_64 now (#1051) --- app-accessibility/espeak/espeak-1.48.04.recipe | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app-accessibility/espeak/espeak-1.48.04.recipe b/app-accessibility/espeak/espeak-1.48.04.recipe index 37d902d12..c2df6265c 100644 --- a/app-accessibility/espeak/espeak-1.48.04.recipe +++ b/app-accessibility/espeak/espeak-1.48.04.recipe @@ -10,13 +10,13 @@ which are based on human speech recordings." HOMEPAGE="http://espeak.sourceforge.net/" COPYRIGHT="2005-2014 Jonathan Duddington" LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="http://sourceforge.net/projects/espeak/files/espeak/espeak-1.48/espeak-1.48.04-source.zip" CHECKSUM_SHA256="bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659" SOURCE_DIR="espeak-${portVersion}-source" PATCHES="espeak-1.48.04.patch" -ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 ?x86 x86_64" PROVIDES=" espeak = $portVersion @@ -39,7 +39,13 @@ BUILD_PREREQUIRES=" BUILD() { cd src - make LIB_STDCPP=-lstdc++.r4 \ + + STDCPPLIBS=-lstdc++ + if [ "$targetArchitecture" = x86_gcc2 ]; then + STDCPPLIBS=-lstdc++.r4 + fi + + make LIB_STDCPP=$STDCPPLIBS \ AUDIO=wave LIB_PTHREAD= \ VISIBILITY_FLAG= \ PREFIX=$prefix \ @@ -50,7 +56,7 @@ BUILD() INSTALL() { cd src - make LIB_STDCPP=-lstdc++.r4 \ + make LIB_STDCPP=$STDCPPLIBS \ AUDIO=wave LIB_PTHREAD= \ VISIBILITY_FLAG= \ PREFIX=$prefix \