From 33cadfd0043ffa5a355d22770630267b1d1b7ce3 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Thu, 28 Aug 2014 17:32:07 +0200 Subject: [PATCH] Fix festival build Change-Id: I157af06061f9c7f479836e170bda01e377e37e93 Signed-off-by: Ronan Le Martret --- recipes-tizen/festival/festival-extraconf.inc | 40 +++++++++++++++++++++++++++ recipes-tizen/festival/festival.inc | 9 +----- 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/recipes-tizen/festival/festival-extraconf.inc b/recipes-tizen/festival/festival-extraconf.inc index e69de29..9634a56 100644 --- a/recipes-tizen/festival/festival-extraconf.inc +++ b/recipes-tizen/festival/festival-extraconf.inc @@ -0,0 +1,40 @@ +do_prep_prepend() { + pushd ${S}/../ + ln -s ${S} festival-2.1 + popd +} + +INSANE_SKIP_${PN} = "dev-deps" + +do_compile() { + cd ${S} + LANG=C + export LANG + unset DISPLAY + LD_AS_NEEDED=1; export LD_AS_NEEDED ; + +# festival + + autotools_do_configure --prefix=${prefix} \ + --libdir=${prefix}/lib \ + --datadir=${prefix}/share/festival \ + --sysconfdir=${sysconfdir} + + cd .. + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/speech_tools/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/festival-2.1/src/lib + + # speech tools + cd speech_tools + + ./configure --prefix=${prefix} \ + --libdir=${prefix}/lib \ + --datadir=${prefix}/share/festival \ + --sysconfdir=${sysconfdir} + + make CC="i586-poky-linux-gcc -fPIC $RPM_OPT_FLAGS" CXX="i586-poky-linux-g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing" + cd ../festival-2.1 + make CC="i586-poky-linux-gcc -fPIC $RPM_OPT_FLAGS" CXX="i586-poky-linux-g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing" + make doc + +} \ No newline at end of file diff --git a/recipes-tizen/festival/festival.inc b/recipes-tizen/festival/festival.inc index 6d5db0a..f7a0fda 100644 --- a/recipes-tizen/festival/festival.inc +++ b/recipes-tizen/festival/festival.inc @@ -115,14 +115,7 @@ do_install() { export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/speech_tools/lib export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/festival-2.1/src/lib cd - - # - oe_runmake \ - DESTDIR=${D} \ - INSTALL_ROOT=${D} \ - BINDIR=${prefix}/bin \ - install - rm -f ${D}${infodir}/dir - find ${D} -regex ".*\.la$" | xargs rm -f -- + #%%make_install find ${D} -regex ".*\.a$" | xargs rm -f -- #make INSTALLED_BIN=$RPM_BUILD_ROOT${prefix}/bin make_installed_bin_shared cd ../speech_tools -- 2.7.4