diff mbox

shairport-sync: requires C++

Message ID 208617074343a6ecf1be15a96c82bdb148d5b675.1490814571.git.baruch@tkos.co.il
State Accepted
Headers show

Commit Message

Baruch Siach March 29, 2017, 7:09 p.m. UTC
Fixes:
http://autobuild.buildroot.net/results/122/122d6cedf0205e8db27d498d6a2a839e11e7b6f2/
http://autobuild.buildroot.net/results/bef/bef5fb328e6688107496cb213d8aeeca527abf03/

Cc: Jörg Krause <joerg.krause@embedded.rocks>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 package/shairport-sync/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Thomas Petazzoni March 29, 2017, 7:54 p.m. UTC | #1
Hello,

On Wed, 29 Mar 2017 22:09:31 +0300, Baruch Siach wrote:
> Fixes:
> http://autobuild.buildroot.net/results/122/122d6cedf0205e8db27d498d6a2a839e11e7b6f2/
> http://autobuild.buildroot.net/results/bef/bef5fb328e6688107496cb213d8aeeca527abf03/
> 
> Cc: Jörg Krause <joerg.krause@embedded.rocks>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  package/shairport-sync/Config.in | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Applied to master, thanks. In practice, most of the code in
shairport-sync is in C, except one file in C++, which is only compiled
conditionally (and we don't build it). However it seems like automake
uses CXX even if the C++ file is not part of the build.

Thomas
Peter Korsgaard March 30, 2017, 7:39 p.m. UTC | #2
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > Hello,
 > On Wed, 29 Mar 2017 22:09:31 +0300, Baruch Siach wrote:
 >> Fixes:
 >> http://autobuild.buildroot.net/results/122/122d6cedf0205e8db27d498d6a2a839e11e7b6f2/
 >> http://autobuild.buildroot.net/results/bef/bef5fb328e6688107496cb213d8aeeca527abf03/
 >> 
 >> Cc: Jörg Krause <joerg.krause@embedded.rocks>
 >> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
 >> ---
 >> package/shairport-sync/Config.in | 5 +++--
 >> 1 file changed, 3 insertions(+), 2 deletions(-)

 > Applied to master, thanks. In practice, most of the code in
 > shairport-sync is in C, except one file in C++, which is only compiled
 > conditionally (and we don't build it). However it seems like automake
 > uses CXX even if the C++ file is not part of the build.

That is afaik because of the unconditional AC_PROG_CXX. For other
packages (E.G. package/ifplugd/0003-no-cxx.patch) we patch it out, but
something upstreamable would naturally be nicer.
diff mbox

Patch

diff --git a/package/shairport-sync/Config.in b/package/shairport-sync/Config.in
index d70121b9fd78..c2a5565402d6 100644
--- a/package/shairport-sync/Config.in
+++ b/package/shairport-sync/Config.in
@@ -2,6 +2,7 @@  config BR2_PACKAGE_SHAIRPORT_SYNC
 	bool "shairport-sync"
 	depends on BR2_USE_MMU # libdaemon
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_ALSA_LIB_MIXER
 	select BR2_PACKAGE_LIBCONFIG
@@ -34,6 +35,6 @@  config BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR
 
 endif
 
-comment "shairport-sync needs a toolchain w/ NPTL"
+comment "shairport-sync needs a toolchain w/ C++, NPTL"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL