[Buildroot] [PATCH 1/1] package/ace: needs C++11

* [Buildroot] [PATCH 1/1] package/ace: needs C++11
@ 2022-02-07 17:32 Fabrice Fontaine
  2022-02-07 18:24 ` Peter Korsgaard
  0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2022-02-07 17:32 UTC (permalink / raw)
  To: buildroot; +Cc: Matt Weber, Fabrice Fontaine

ace needs C++11 since its addition in commit
3621918d1bc1ddc9312dd1cc8dec6db61e712fe2 to avoid the following build
failure:

In file included from /home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/chrono:35:0,
                 from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/Time_Value.h:23,
                 from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/OS_NS_unistd.h:25,
                 from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.inl:2,
                 from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.h:886,
                 from /home/peko/autobuild/instance-1/output-1/build/ace-7.0.1/ace/ACE.cpp:1:
/home/peko/autobuild/instance-1/output-1/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support is currently experimental, and must be enabled with the -std=c++11 or -std=gnu++11 compiler options.
 #error This file requires compiler and library support for the \
  ^

Fixes:
 - http://autobuild.buildroot.org/results/13376405e313da112f546076a10859e60631d5d5

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/ace/Config.in | 8 ++++++--
 package/ace/ace.mk    | 9 +++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

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
 
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread