p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
meta-ros/recipes-extended
History
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
..
assimp assimp: avoid work on #526 with update (resolves #526) 2017-09-04 08:38:05 +02:00
bfl bfl: patch to obtain pkgconfig sanity 2016-02-15 09:38:53 -01:00
cmusphinx gscam, pocketsphinx, ros-pocketsphinx, wxwidgets, wxpython, joint-state-publisher, sound-play: blacklist because of gstreamer 0.10 dependency 2019-07-03 17:41:56 +00:00
collada-dom collada-dom: fix compilation with recent gcc 2017-02-08 12:12:29 +02:00
fcl fcl: don't set RPATH for libfcl.so 2017-03-22 12:34:12 +02:00
festival festival, speech-tools: fix festival reusing CC value from staged speech-tools est_program_makefile, gcc_defaults.mak 2019-07-03 22:21:18 +00:00
freeglut freeglut, libfreenect, wxpython, wxwidgets, freenect-camera, freenect-launch, joint-state-publisher: require x11 in DISTRO_FEATURES 2019-07-03 17:41:56 +00:00
geographiclib geographiclib: fix unpackaged files 2019-07-03 18:00:03 +00:00
kdl orocos-kdl: strip STAGING_DIR_TARGET prefix from cmake config file 2018-04-13 15:56:35 +02:00
libccd libccd: update to new GitHub source 2016-05-03 09:59:49 +02:00
libflann libflann: backport patch for cmake >= 3.11 2018-07-10 06:58:03 +02:00
libfreenect freeglut, libfreenect, wxpython, wxwidgets, freenect-camera, freenect-launch, joint-state-publisher: require x11 in DISTRO_FEATURES 2019-07-03 17:41:56 +00:00
ompl ompl: upgrade to version 1.1.1 2017-07-18 14:08:58 -07:00
pcl pcl, ros2-demo-nodes-cpp: fix build for qemuarm 2019-07-03 19:52:51 +00:00
qhull qhull: fix build with conf/distro/include/security_flags.inc 2018-04-10 13:02:55 +00:00
realsense-camera realsense-camera: require ros-realsense DISTRO_FEATURE, because it depends on optional meta-intel-realsense layer 2019-07-03 17:41:56 +00:00
sophus sophus: strip STAGING_DIR_TARGET prefix from cmake config file 2018-04-13 15:56:35 +02:00
speech-tools festival, speech-tools: fix festival reusing CC value from staged speech-tools est_program_makefile, gcc_defaults.mak 2019-07-03 22:21:18 +00:00
wxwidgets freeglut, libfreenect, wxpython, wxwidgets, freenect-camera, freenect-launch, joint-state-publisher: require x11 in DISTRO_FEATURES 2019-07-03 17:41:56 +00:00