Fix festival for build 64

Change-Id: Ie1fda83aa5eae225d862a5b5ae2e059fd3094a14
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/recipes-tizen/festival/festival-extraconf.inc b/recipes-tizen/festival/festival-extraconf.inc
index 9a7be74..e9add06 100644 (file)
--- a/recipes-tizen/festival/festival-extraconf.inc
+++ b/recipes-tizen/festival/festival-extraconf.inc
@@ -1,10 +1,10 @@
 do_prep_prepend() {
  pushd ${S}/../
- ln -sf ${S} festival-2.1
+ ln -sf ${S} ${PN}-2.1
  popd 
 }
 
-INSANE_SKIP_${PN} = "dev-deps"
+SRC_URI += "file://remove_doc.patch"
 
 do_compile() {
  cd ${S}
@@ -29,12 +29,13 @@ do_compile() {
 
  ./configure --prefix=${prefix} \
             --libdir=${prefix}/lib \
-                --datadir=${prefix}/share/festival \
-            --sysconfdir=${sysconfdir}
+            --datadir=${prefix}/share/festival \
+            --sysconfdir=${sysconfdir} \
+            --host=${HOST_SYS}
 
- make CC="i586-oe-linux-gcc -fPIC $RPM_OPT_FLAGS" CXX="i586-oe-linux-g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing"
+ 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="i586-oe-linux-gcc -fPIC $RPM_OPT_FLAGS" CXX="i586-oe-linux-g++ $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing"
- make doc
-
+ make CC="${CC} -fPIC $RPM_OPT_FLAGS" CXX="${CXX} $RPM_OPT_FLAGS -fPIC -Wno-non-template-friend -ffriend-injection -fno-strict-aliasing"
 }
+
+INSANE_SKIP_${PN} = "dev-deps"
\ No newline at end of file

diff --git a/recipes-tizen/festival/festival.inc b/recipes-tizen/festival/festival.inc
index fd1b354..29b68f1 100644 (file)
--- a/recipes-tizen/festival/festival.inc
+++ b/recipes-tizen/festival/festival.inc
@@ -135,9 +135,9 @@ do_install() {
  install -m 755 bin/festival_server* ${D}${prefix}/bin/
  install -m 755 examples/saytime ${D}${prefix}/bin/
  # install manpages
- install -D -m 644 doc/festival.1 ${D}${mandir}/man1/festival.1
- install -m 644 doc/festival_client.1 ${D}${mandir}/man1/
- install -m 644 doc/text2wave.1 ${D}${mandir}/man1/
+ #install -D -m 644 doc/festival.1 ${D}${mandir}/man1/festival.1
+ #install -m 644 doc/festival_client.1 ${D}${mandir}/man1/
+ #install -m 644 doc/text2wave.1 ${D}${mandir}/man1/
  # install configs
  install -D lib/festival.scm ${D}${sysconfdir}/festival.scm
  # install dictionarys

diff --git a/recipes-tizen/festival/files/remove_doc.patch b/recipes-tizen/festival/files/remove_doc.patch
new file mode 100644 (file)
index 0000000..891c9fa
--- /dev/null
+++ b/recipes-tizen/festival/files/remove_doc.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 992877b..9cf4631 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,7 +39,7 @@
+ ###########################################################################
+ TOP=.
+ DIRNAME=.
+-BUILD_DIRS = src lib examples bin doc
++BUILD_DIRS = src lib examples bin
+ ALL_DIRS=config $(BUILD_DIRS) testsuite
+ CONFIG=configure configure.in config.sub config.guess \
+        missing install-sh mkinstalldirs