From patchwork Tue Oct 27 17:40:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nosthoff X-Patchwork-Id: 1388823 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=busybox.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=heine.tech header.i=@heine.tech header.a=rsa-sha256 header.s=dkim header.b=hrHK0kIV; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CLJsm01NVz9sV7 for ; Wed, 28 Oct 2020 04:41:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4CD8D864A4; Tue, 27 Oct 2020 17:41:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id v+aLgGF5UlIF; Tue, 27 Oct 2020 17:41:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A9C6E864D4; Tue, 27 Oct 2020 17:41:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 73B371BF283 for ; Tue, 27 Oct 2020 17:41:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6FC01864D4 for ; Tue, 27 Oct 2020 17:41:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6hi7CdN4cVJH for ; Tue, 27 Oct 2020 17:41:23 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.heine.tech (mail.heine.tech [195.201.24.99]) by whitealder.osuosl.org (Postfix) with ESMTPS id DB440864A4 for ; Tue, 27 Oct 2020 17:41:22 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 1DE771822DB; Tue, 27 Oct 2020 18:41:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=heine.tech; s=dkim; t=1603820481; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=ir3WCPNnfhmQ9hGeYjS9GSS0rsTLt388ML4ffO1Y44A=; b=hrHK0kIVSf0nTR14hc+FQHZUKS1j9EApAByI6dAUAO9JI+9mRnmZi4ykRlItUuRRNPT+xO S94GiXeRQkxZR8XDu6VSeKNkeU+tFziOYiFAhKXlhQ4p1UBOMcQmgLUkZPux/nhYvBfdPI fg7hPA4NGIE/HVSu+xWyTQlTx0vVOsc= To: buildroot@buildroot.org Date: Tue, 27 Oct 2020 18:40:44 +0100 Message-Id: <20201027174046.17157-2-buildroot@heine.tech> In-Reply-To: <20201027174046.17157-1-buildroot@heine.tech> References: <20201027174046.17157-1-buildroot@heine.tech> MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 Subject: [Buildroot] [PATCH 1/3] package/libabseil-cpp: enforce C++11 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Michael Nosthoff via buildroot From: Michael Nosthoff Reply-To: buildroot@heine.tech Cc: Michael Nosthoff Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Michael Nosthoff For gcc < 6 the c++ default is 98. Abseil needs at least 11 but doesn't enforce this anymore. So we need to do this. Signed-off-by: Michael Nosthoff --- package/libabseil-cpp/libabseil-cpp.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/libabseil-cpp/libabseil-cpp.mk b/package/libabseil-cpp/libabseil-cpp.mk index dfcf892f65..8490b6d948 100644 --- a/package/libabseil-cpp/libabseil-cpp.mk +++ b/package/libabseil-cpp/libabseil-cpp.mk @@ -20,5 +20,15 @@ HOST_LIBABSEIL_CPP_CONF_OPTS = \ -DABSL_USE_GOOGLETEST_HEAD=OFF \ -DABSL_RUN_TESTS=OFF +# abseil needs c++ >= 11 but doesn't set this anymore, +# before gcc6 the default is 98. +ifeq ($(BR2_GCC_AT_LEAST_6_0),) +LIBABSEIL_CPP_CONF_OPTS += -DCMAKE_CXX_STANDARD=11 +endif + +ifeq ($(BR2_HOST_GCC_AT_LEAST_6_0),) +HOST_LIBABSEIL_CPP_CONF_OPTS += -DCMAKE_CXX_STANDARD=11 +endif + $(eval $(cmake-package)) $(eval $(host-cmake-package))