From 9eefa845a2617333318a59d767fa61363a39e4cf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 27 Jan 2014 22:05:45 +0100 Subject: [PATCH] libcdio: make C++ support optional C++ support is only needed for the example programs (that we don't build) and C++ bindings. Signed-off-by: Peter Korsgaard --- package/libcdio/Config.in | 4 ---- package/libcdio/libcdio.mk | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libcdio/Config.in b/package/libcdio/Config.in index d2d61e7bd0..555eb2915e 100644 --- a/package/libcdio/Config.in +++ b/package/libcdio/Config.in @@ -1,11 +1,7 @@ config BR2_PACKAGE_LIBCDIO bool "libcdio" select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - depends on BR2_INSTALL_LIBSTDCPP help The GNU Compact Disc Input and Control library. http://www.gnu.org/software/libcdio/ - -comment "libcdio needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/libcdio/libcdio.mk b/package/libcdio/libcdio.mk index b114809042..b9aec9e929 100644 --- a/package/libcdio/libcdio.mk +++ b/package/libcdio/libcdio.mk @@ -15,6 +15,10 @@ ifeq ($(BR2_ENABLE_LOCALE),) LIBCDIO_DEPENDENCIES += libiconv endif +ifeq ($(BR2_INSTALL_LIBSTDCPP),) +LIBCDIO_CONF_OPT += --disable-cxx +endif + ifeq ($(BR2_PACKAGE_NCURSES),y) LIBCDIO_DEPENDENCIES += ncurses else -- 2.30.2