| Message ID | 1407742731-5300-1-git-send-email-arnaud@intelibre.fr |
|---|---|
| State | Superseded |
| Headers | show |
Hi Arnaud, arnaud@intelibre.fr schreef: >From: Arnaud Aujon <arnaud@intelibre.fr> > >Fixes autobuild http://autobuild.buildroot.net/results/dae/dae5c59dfa127e1c3f9e3885cdd1b97e54d8fe41/ >and http://autobuild.buildroot.net/results/fa0/fa04a0fe7d7a201c5f733bd798c0da50ffb81271/ > >espeak uses fork(), don't work on non-MMU platforms > >Signed-off-by: Arnaud Aujon <arnaud@intelibre.fr> >--- > package/espeak/Config.in | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > >diff --git a/package/espeak/Config.in b/package/espeak/Config.in >index ec81893..57c7d18 100644 >--- a/package/espeak/Config.in >+++ b/package/espeak/Config.in >@@ -1,17 +1,19 @@ >-comment "espeak needs a toolchain w/ C++, wchar, threads" >- depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR >- > config BR2_PACKAGE_ESPEAK > bool "espeak" > depends on BR2_INSTALL_LIBSTDCPP > depends on BR2_USE_WCHAR > depends on BR2_TOOLCHAIN_HAS_THREADS >+ depends on BR2_USE_MMU # fork() > help > espeak is a speech synthesizer software for English and > other languages. > > http://espeak.sourceforge.net/ > >+comment "espeak needs a toolchain w/ C++, wchar, threads" >+ depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR >+ depends on BR2_USE_MMU >+ While the moving of this comment seems to be the right thing to do, I believe this will break the indentation/nesting of the suboptions of espeak. Best regards, Thomas
>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> writes: > Hi Arnaud, > arnaud@intelibre.fr schreef: >> From: Arnaud Aujon <arnaud@intelibre.fr> >> >> Fixes autobuild http://autobuild.buildroot.net/results/dae/dae5c59dfa127e1c3f9e3885cdd1b97e54d8fe41/ >> and http://autobuild.buildroot.net/results/fa0/fa04a0fe7d7a201c5f733bd798c0da50ffb81271/ >> >> espeak uses fork(), don't work on non-MMU platforms >> >> Signed-off-by: Arnaud Aujon <arnaud@intelibre.fr> >> --- >> package/espeak/Config.in | 14 ++++++++------ >> 1 file changed, 8 insertions(+), 6 deletions(-) >> >> diff --git a/package/espeak/Config.in b/package/espeak/Config.in >> index ec81893..57c7d18 100644 >> --- a/package/espeak/Config.in >> +++ b/package/espeak/Config.in >> @@ -1,17 +1,19 @@ >> -comment "espeak needs a toolchain w/ C++, wchar, threads" >> - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR >> - >> config BR2_PACKAGE_ESPEAK >> bool "espeak" >> depends on BR2_INSTALL_LIBSTDCPP >> depends on BR2_USE_WCHAR >> depends on BR2_TOOLCHAIN_HAS_THREADS >> + depends on BR2_USE_MMU # fork() >> help >> espeak is a speech synthesizer software for English and >> other languages. >> >> http://espeak.sourceforge.net/ >> >> +comment "espeak needs a toolchain w/ C++, wchar, threads" >> + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR >> + depends on BR2_USE_MMU >> + > While the moving of this comment seems to be the right thing to do, I believe this will break the indentation/nesting of the suboptions of espeak. Indeed. Comments should go at the very top or bottom of the file. Care to send a reworked patch that leaves the comment at the top?
Hi, On 08/11/2014 01:06 PM, Peter Korsgaard wrote: > >> http://espeak.sourceforge.net/ > >> > >> +comment "espeak needs a toolchain w/ C++, wchar, threads" > >> + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR > >> + depends on BR2_USE_MMU > >> + > > > While the moving of this comment seems to be the right thing to do, I believe this will break the indentation/nesting of the suboptions of espeak. > > Indeed. Comments should go at the very top or bottom of the file. Care > to send a reworked patch that leaves the comment at the top? > Yes sure, I will re-send shortly. I moved the comment to match the xbmc package Config.in, so I guess there is maybe a few other packages to fix the same way.
diff --git a/package/espeak/Config.in b/package/espeak/Config.in index ec81893..57c7d18 100644 --- a/package/espeak/Config.in +++ b/package/espeak/Config.in @@ -1,17 +1,19 @@ -comment "espeak needs a toolchain w/ C++, wchar, threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR - config BR2_PACKAGE_ESPEAK bool "espeak" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() help espeak is a speech synthesizer software for English and other languages. http://espeak.sourceforge.net/ +comment "espeak needs a toolchain w/ C++, wchar, threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR + depends on BR2_USE_MMU + if BR2_PACKAGE_ESPEAK choice @@ -26,14 +28,14 @@ config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA select BR2_PACKAGE_PORTAUDIO select BR2_PACKAGE_PORTAUDIO_CXX -comment "pulseaudio backend needs a toolchain with largefile" - depends on !BR2_LARGEFILE - config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO bool "pulseaudio" select BR2_PACKAGE_PULSEAUDIO depends on BR2_LARGEFILE # pulseaudio +comment "pulseaudio backend needs a toolchain with largefile" + depends on !BR2_LARGEFILE + endchoice endif # BR2_PACKAGE_ESPEAK