diff --git a/package/ace/Config.in b/package/ace/Config.in index 226e34df32..5000f2352f 100644 --- a/package/ace/Config.in +++ b/package/ace/Config.in @@ -2,11 +2,15 @@ config BR2_PACKAGE_ACE bool "ace" depends on BR2_TOOLCHAIN_USES_GLIBC depends on !BR2_STATIC_LIBS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 help The ADAPTIVE Communication Environment (ACE(TM)) An OO Network Programming Toolkit in C++. http://www.dre.vanderbilt.edu/~schmidt/ACE.html -comment "ACE needs a glibc toolchain, dynamic library" - depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS +comment "ACE needs a glibc toolchain, dynamic library, C++, gcc >= 4.8" + depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \ + !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package/ace/ace.mk b/package/ace/ace.mk index b6b4cfbc24..8df89d8c6f 100644 --- a/package/ace/ace.mk +++ b/package/ace/ace.mk @@ -17,6 +17,10 @@ ACE_CPE_ID_PRODUCT = adaptive_communication_environment # Only compiling ACE libraries (no TAO) ACE_LIBARIES = ace ACEXML Kokyu netsvcs protocols/ace +ACE_MAKE_OPTS = \ + ACE_ROOT="$(@D)" \ + DEFFLAGS="$(TARGET_CPPFLAGS) -std=c++11" + ifeq ($(BR2_PACKAGE_OPENSSL),y) ACE_LIBARIES += ace/SSL ACE_DEPENDENCIES += openssl @@ -39,14 +43,15 @@ endef define ACE_BUILD_CMDS $(foreach lib,$(ACE_LIBARIES), \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" all + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) \ + $(ACE_MAKE_OPTS) all ) endef define ACE_LIBARIES_INSTALL mkdir -p $(1)/usr/share/ace $(foreach lib,$(ACE_LIBARIES), \ - $(MAKE) -C $(@D)/$(lib) ACE_ROOT="$(@D)" DESTDIR=$(1) install + $(MAKE) -C $(@D)/$(lib) $(ACE_MAKE_OPTS) DESTDIR=$(1) install ) endef