From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4DA68158083 for ; Thu, 5 Sep 2024 16:55:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6CD30E2A79; Thu, 5 Sep 2024 16:55:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 50CD3E2A79 for ; Thu, 5 Sep 2024 16:55:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64328340754 for ; Thu, 5 Sep 2024 16:55:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 03CB31716 for ; Thu, 5 Sep 2024 16:55:44 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1725555323.694c3954f69c851f50aabf227597c6bd7fbeee25.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/mosh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/mosh/mosh-1.4.0.ebuild X-VCS-Directories: net-misc/mosh/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 694c3954f69c851f50aabf227597c6bd7fbeee25 X-VCS-Branch: master Date: Thu, 5 Sep 2024 16:55:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 39ff2df2-424a-4935-ae87-7f41dd870f17 X-Archives-Hash: b7f24aa48015a6f55bcef56ba07c9824 commit: 694c3954f69c851f50aabf227597c6bd7fbeee25 Author: Paul Zander gmail com> AuthorDate: Thu Sep 5 09:29:51 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Sep 5 16:55:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=694c3954 net-misc/mosh: set -std=gnu++17 for newer abseil-cpp Setting the C++ standard via append-cxxflags ignores the configure.ac logic that already does that for the same reasons and leads to duplicate flats. To rectify that, change the targeted standard in configure.ac itself. Closes: https://bugs.gentoo.org/935130 Signed-off-by: Paul Zander gmail.com> Signed-off-by: Sam James gentoo.org> net-misc/mosh/mosh-1.4.0.ebuild | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/net-misc/mosh/mosh-1.4.0.ebuild b/net-misc/mosh/mosh-1.4.0.ebuild index 8792d6668383..02cffd896095 100644 --- a/net-misc/mosh/mosh-1.4.0.ebuild +++ b/net-misc/mosh/mosh-1.4.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit autotools bash-completion-r1 flag-o-matic +inherit autotools bash-completion-r1 MY_P=${PN}-${PV/_rc/rc} DESCRIPTION="Mobile shell that supports roaming and intelligent local echo" @@ -51,15 +51,20 @@ PATCHES=( src_prepare() { default + # abseil-cpp needs >=c++14 + local CXXSTD="14" + if has_version ">=dev-cpp/abseil-cpp-20240722.0"; then + # needs >=c++17 + CXXSTD="17" + fi + sed -e "/AX_CXX_COMPILE_STDCXX/{s/11/${CXXSTD}/}" -i configure.ac || die + eautoreconf } src_configure() { MAKEOPTS+=" V=1" - # protobuf needs >=c++14 - append-cxxflags -std=gnu++14 - local myeconfargs=( # We install it ourselves in src_install --disable-completion