From cfca9899b26b2bd57956238377cc073c7d2d142a Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Tue, 16 May 2023 11:35:08 +0200 Subject: [PATCH] virtualbox6: fix build errors with `-std=gnu++20` Fixes #4872 --- repos/ports/lib/mk/virtualbox6-common.inc | 6 ++++++ repos/ports/src/virtualbox6/target.mk | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/repos/ports/lib/mk/virtualbox6-common.inc b/repos/ports/lib/mk/virtualbox6-common.inc index 329d4db86f..6e10f85cbf 100644 --- a/repos/ports/lib/mk/virtualbox6-common.inc +++ b/repos/ports/lib/mk/virtualbox6-common.inc @@ -63,6 +63,12 @@ VBOX_CC_OPT += -DVBOX_WITH_GUEST_PROPS # prevent access to port content at the dependency stage of the build system ifeq ($(called_from_lib_mk),yes) include $(VIRTUALBOX_DIR)/Version.kmk +CC_CXX_OPT_STD = -std=gnu++17 +endif + +# if included from virtualbox6/target.mk provide version but leave CC_CXX_OPT_STD alone +ifeq ($(included_from_target_mk),yes) +include $(VIRTUALBOX_DIR)/Version.kmk endif VIRTUALBOX_PACKAGE_STRING_x86_32 = GenodeOS_32BIT_GENERIC diff --git a/repos/ports/src/virtualbox6/target.mk b/repos/ports/src/virtualbox6/target.mk index 8ac04a1d9d..941004d21c 100644 --- a/repos/ports/src/virtualbox6/target.mk +++ b/repos/ports/src/virtualbox6/target.mk @@ -2,8 +2,7 @@ REQUIRES = x86_64 TARGET = virtualbox6 -# fake build pass for lib .inc -called_from_lib_mk := yes +included_from_target_mk := yes include $(REP_DIR)/lib/mk/virtualbox6-common.inc CC_WARN += -Wall