From 3adec9acce35f4a85e882493d1d2acb40ae3973c Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 17 Oct 2014 10:08:07 +0200 Subject: [PATCH] meta-tizen: Fix festival for build 64 Change-Id: Ie1fda83aa5eae225d862a5b5ae2e059fd3094a14 (From meta-tizen rev: 09e78966b8930bd545071758263ffb43035117df) Signed-off-by: Ronan Le Martret Signed-off-by: Patrick Ohly --- .../recipes-tizen/festival/festival-extraconf.inc | 17 +++++++++-------- meta-tizen/recipes-tizen/festival/festival.inc | 6 +++--- .../recipes-tizen/festival/files/remove_doc.patch | 13 +++++++++++++ 3 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 meta-tizen/recipes-tizen/festival/files/remove_doc.patch diff --git a/meta-tizen/recipes-tizen/festival/festival-extraconf.inc b/meta-tizen/recipes-tizen/festival/festival-extraconf.inc index 9a7be74..e9add06 100644 --- a/meta-tizen/recipes-tizen/festival/festival-extraconf.inc +++ b/meta-tizen/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/meta-tizen/recipes-tizen/festival/festival.inc b/meta-tizen/recipes-tizen/festival/festival.inc index fd1b354..29b68f1 100644 --- a/meta-tizen/recipes-tizen/festival/festival.inc +++ b/meta-tizen/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/meta-tizen/recipes-tizen/festival/files/remove_doc.patch b/meta-tizen/recipes-tizen/festival/files/remove_doc.patch new file mode 100644 index 0000000..891c9fa --- /dev/null +++ b/meta-tizen/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 -- 2.7.4