Commit Graph

8 Commits

Author SHA1 Message Date
Martin Jansa 34e4fd2ca1 festival, speech-tools: fix festival reusing CC value from staged speech-tools est_program_makefile, gcc_defaults.mak
* fixes:
  https://github.com/ros/meta-ros/issues/553

* the files est_program_makefile, gcc_defaults.mak staged by speech-tools contain
  CC/CXX variables which include --sysroot parameter, poiting to speech-tools RSS:
  grep -R sysroot= work/core2-32-oe-linux/festival/2.4-r0/recipe-sysroot/usr/share/speech-tools/
  work/core2-32-oe-linux/festival/2.4-r0/recipe-sysroot/usr/share/speech-tools/lib/est_program_makefile: i686-oe-linux-gcc  -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/jenkins/mjansa/build-nodistro-master/BUILD/work/core2-32-oe-linux/speech-tools
/2.4-r0/recipe-sysroot -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed     -o $* $($*_OBJ) $($*_LIBS)   -L$(EST_HOME)/lib -lestools -L$(EST_HOME)/lib -lestbase -L$(EST_HOME)/lib -leststring   -lncurses   -ldl -lncurses -lm  -lstdc++
  work/core2-32-oe-linux/festival/2.4-r0/recipe-sysroot/usr/share/speech-tools/lib/est_program_makefile: i686-oe-linux-gcc  -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/jenkins/mjansa/build-nodistro-master/BUILD/work/core2-32-oe-linux/speech-tools
/2.4-r0/recipe-sysroot -c  -fno-implicit-templates  -O3 -Wall           -I$(EST_HOME)/include      $($*_INCLUDES) $($*_DEFINES) $*.cc
  work/core2-32-oe-linux/festival/2.4-r0/recipe-sysroot/usr/share/speech-tools/lib/est_program_makefile: i686-oe-linux-gcc  -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/jenkins/mjansa/build-nodistro-master/BUILD/work/core2-32-oe-linux/speech-tools
/2.4-r0/recipe-sysroot -c  -fno-implicit-templates  -O3 -Wall           -I$(EST_HOME)/include      $($*_INCLUDES) $($*_DEFINES) $*.c
  work/core2-32-oe-linux/festival/2.4-r0/recipe-sysroot/usr/share/speech-tools/config/compilers/gcc_defaults.mak:CC=i686-oe-linux-gcc  -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/jenkins/mjansa/build-nodistro-master/BUILD/work/core2-32-oe-linux/s
peech-tools/2.4-r0/recipe-sysroot
  work/core2-32-oe-linux/festival/2.4-r0/recipe-sysroot/usr/share/speech-tools/config/compilers/gcc_defaults.mak:CXX=i686-oe-linux-gcc  -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/jenkins/mjansa/build-nodistro-master/BUILD/work/core2-32-oe-linux/
speech-tools/2.4-r0/recipe-sysroot

* the issue is that when festival is being configured, the speech-tools
  RSS might already be removed by rm_work (nor not created in this build
  at all when speech-tools were reused from sstate), causing:
  | making dependencies -- festival.cc Phone.cc utterance.cc features.cc wave.cc wagon_interp.cc linreg.cc audspio.cc server.cc client.cc web.cc tcl.cc wfst.cc ngram.cc viterbi.cc ModuleDescription.cc
  | i686-oe-linux-gcc  -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse --sysroot=/jenkins/mjansa/build-nodistro-master/BUILD/work/core2-32-oe-linux/speech-tools/2.4-r0/recipe-sysroot -c  -fno-implicit-templates  -O3 -Wall           -I../../../src/include -I/jen
kins/mjansa/build-nodistro-master/BUILD/work/core2-32-oe-linux/festival/2.4-r0/recipe-sysroot/usr/share/speech-tools/include      -DINSTANTIATE_TEMPLATES -DFTNAME='Festival Speech Synthesis System' -DFTLIBDIRC='/usr/share/festival ' -DFTVERSION='2.4' -DFTSTATE='re
lease'  -DFTDATE='December 2014' -DFTOSTYPE=\"unknown_DebianGNULinux\" festival.cc
  | festival.cc:40:10: fatal error: cstdio: No such file or directory
  |    40 | #include <cstdio>
  |       |          ^~~~~~~~
  | compilation terminated.
  | Makefile:65: recipe for target 'festival.o' failed

* this is cleary wrong, change both speech-tools and festival
  to just respect CC/CXX variables passed by EXTRA_OEMAKE

* pass LDFLAGS through CXX as well instead of LINKFLAGS, CXX is used
  in default LINK_COMMAND anyway, so we don't need to mess with default
  LINKFLAGS added by the .mak files
  config/rules/defaults.mak:    LINK_COMMAND = $(CXX) $(LINKFLAGS) $(TEMPLATES)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-07-03 22:21:18 +00:00
Martin Jansa c289a42a00 festival: fix host-user-contamination issues
* fixes:
ERROR: festival-2.4-r0 do_package_qa: QA Issue: festival: /festival/usr/share/festival/dicts/wsj.wp39.poslexR is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/wsj.wp39.tri.ngrambin is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/COPYING.poslex is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/cmu/cmudict-0.4.diff is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/cmu/cmu_lts_rules.scm is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/cmu/cmudict_extensions.scm is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/cmu/cmulex.scm is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/cmu/cmudict-0.4.out is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/cmu/Makefile is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/cmu/cmudict_compile.scm is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/cmu/allowables.scm is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/cmu/cmudict-0.4.scm is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/cmu/cmu2ft is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/cmu/COPYING is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/oald/cuvoald710-0.2.scm is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/oald/oald-0.4.out is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/oald/oald2ft.tar.gz is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/oald/Makefile is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/oald/oald_extensions.scm is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/oald/oald_lts_rules.scm is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/oald/oaldlex.scm is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/oald/README.oald is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/dicts/oald/COPYING is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/voices/english/rab_diphone/COPYING is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/voices/english/rab_diphone/festvox/rab_diphone.scm is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/voices/english/rab_diphone/group/rablpc16k.group is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/voices/english/kal_diphone/COPYING is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/voices/english/kal_diphone/festvox/kal_diphone.scm is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/voices/english/kal_diphone/festvox/kaldurtreeZ.scm is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination
festival: /festival/usr/share/festival/voices/english/kal_diphone/group/kallpc16k.group is owned by uid 1026, which is the same as the user running bitbake. This may be due to host contamination [host-user-contaminated]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-07-03 19:52:51 +00:00
Martin Jansa b7bed9fabd festival: fix the SRC_URI and S variables
* using PN here won't work with multilib
* fixes QA warning:
  WARNING: festival-2.4-r0 do_package_qa: QA Issue: festival: SRC_URI uses PN not BPN [src-uri-bad]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2019-07-03 19:52:51 +00:00
Alistair Francis 181946aac3 festival: Bump to version 2.4
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
2019-07-01 13:05:52 -07:00
Kristof Robot 2ab7e46454 festival: correcting audsp path (resolves #309) 2014-12-24 09:26:50 +01:00
Lukas Bulwahn 078786a259 festival: making install task distro-independent (resolves #285) 2014-08-03 06:32:52 +02:00
Lukas Bulwahn be349dade1 festival: recovering out-of-tree build (resolves #284) 2014-08-03 06:32:52 +02:00
Kristof Robot 44f5608d6b festival: initial commit (resolves #241) 2014-04-16 20:37:25 +02:00