fix festival

Change-Id: Iba2689a5f5c57684de6e39ed65ebb8c2207c3b6c

diff --git a/meta-tizen-common-base/recipes-extended/festival/festival-extraconf.inc b/meta-tizen-common-base/recipes-extended/festival/festival-extraconf.inc
index e9add06..77bbdbd 100644 (file)
--- a/meta-tizen-common-base/recipes-extended/festival/festival-extraconf.inc
+++ b/meta-tizen-common-base/recipes-extended/festival/festival-extraconf.inc
@@ -1,41 +1,17 @@
-do_prep_prepend() {
- pushd ${S}/../
- ln -sf ${S} ${PN}-2.1
- popd 
-}
+PARALLEL_MAKE = ""
 
 SRC_URI += "file://remove_doc.patch"
 
-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
+INSANE_SKIP_${PN} = "dev-deps"
 
- # speech tools
- cd speech_tools
-
- ./configure --prefix=${prefix} \
-            --libdir=${prefix}/lib \
-            --datadir=${prefix}/share/festival \
-            --sysconfdir=${sysconfdir} \
-            --host=${HOST_SYS}
-
- make CC="${CC} -fPIC $RPM_OPT_FLAGS" CXX="${CXX} $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing"
- cd ../festival-2.1
- make CC="${CC} -fPIC $RPM_OPT_FLAGS" CXX="${CXX} $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing"
+do_prep_prepend() {
+ pushd ${S}/../
+ ln -sf ${S} ${PN}-${PV}
+ popd
 }
 
-INSANE_SKIP_${PN} = "dev-deps"
\ No newline at end of file
+do_install_prepend() {
+ touch ${S}/doc/festival.1
+ touch ${S}/doc/festival_client.1
+ touch ${S}/doc/text2wave.1
+}

diff --git a/meta-tizen-common-base/recipes-extended/festival/festival.inc b/meta-tizen-common-base/recipes-extended/festival/festival.inc
index 16c5728..676671e 100644 (file)
--- a/meta-tizen-common-base/recipes-extended/festival/festival.inc
+++ b/meta-tizen-common-base/recipes-extended/festival/festival.inc
@@ -34,19 +34,19 @@ do_prep() {
  cd ${S}
  #extracte source 1 
  pushd ${S}/../
- unp ${S}/packaging/speech_tools-2.1-release.tar.gz 
+ tar -zxf ${S}/packaging/speech_tools-2.1-release.tar.gz
  popd 
  #extracte source 2 
  pushd ${S}/../
- unp ${S}/packaging/festlex_CMU.tar.gz 
+ tar -zxf ${S}/packaging/festlex_CMU.tar.gz
  popd 
  #extracte source 3 
  pushd ${S}/../
- unp ${S}/packaging/festvox_kallpc16k.tar.gz 
+ tar -zxf ${S}/packaging/festvox_kallpc16k.tar.gz
  popd 
  #extracte source 4 
  pushd ${S}/../
- unp ${S}/packaging/festlex_POSLEX.tar.gz 
+ tar -zxf ${S}/packaging/festlex_POSLEX.tar.gz
  popd 
  chmod -Rf a+rX,u+w,g-w,o-w ${S}
  #setup -q -b 1 -b 2 -b 3 -b 4
@@ -116,11 +116,11 @@ do_compile() {
   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}
+  ./configure --host=${HOST_SYS} --prefix=${prefix}               --libdir=${prefix}/lib               --datadir=${prefix}/share/festival               --sysconfdir=${sysconfdir}
   
-  oe_runmake CC="${CC} -fPIC $RPM_OPT_FLAGS" CXX="${HOST_SYS}-g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing"
+  oe_runmake CC="${CC} -fPIC $RPM_OPT_FLAGS" CXX="${CXX} $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing"
   cd ../festival-2.1
-  oe_runmake CC="${CC} -fPIC $RPM_OPT_FLAGS" CXX="${HOST_SYS}-g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing"
+  oe_runmake CC="${CC} -fPIC $RPM_OPT_FLAGS" CXX="${CXX} $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing"
   oe_runmake doc