From nobody Wed May 03 00:29:29 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q9yWF6c6bz48N7w; Wed, 3 May 2023 00:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q9yWF5vr5z3ltS; Wed, 3 May 2023 00:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683073769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5T4F+MvNPSrCSMh0saTtqFR+pgs84TNTjy8h8r1zdAw=; b=ASL4200d8jStZq8MUIL+5GJWRPyIJFRnFSrgAu2HhflJAQpDjp0phzM4N/gldmxTzwisCA UVp4ScTTud6OyF095h8ZBNtoaSZYRf4lGYEq3dj62L6a8FaRIFohYV7wGBAsN+34P9ZPLY 29ggf6HWbVm9vDDyykANvI+vU2PIoJ91Ie6AcJBJKF3W3Svb3YMyhiRAjWBCbcZ8F9kE7y 71AADH5/0UdwqS9cBIDJFWPPtJ8ryDG7201FNKtBY8Y0faFJ5qrXe79utFaxr5TTJxY2Pa s1aMTHgh4FqWIFuzeo99yNFI1IvcmpBVE7eP0UNz28NBw0kfhuTPCBxMcFU3HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683073769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5T4F+MvNPSrCSMh0saTtqFR+pgs84TNTjy8h8r1zdAw=; b=kF0hRpSgi7KDQcaaXL6xPOAibB4OZ/CZzEoXjNatwjAMlc2mzo2EpST9pyc7XBxg48ruM+ Fk30zBBh8Dgu84c0GRZf4oQ17PwX+hc4ZZtLJDGi2qxmzPMNJEy2ekHWW80VzGCzk+sVSH 4SHp0vDbqVlP5O6nNBiEQDrDiC6CQPMt4fRnUSQWxRDAdvoih9wxhFYL38Qh5M1HMJymEU hDlXdPcRGrKQ/zp6IjGTim8ySjTNioJ/a9ReCw2szclPSHcLUnfRndrUS40yqsWJoWo4Vv fZb9mQ7nbganfuriXjSZnG5LrdwwVX5PWOReAcTKPFqQSXUd5katvj0pn53BUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683073769; a=rsa-sha256; cv=none; b=jkb2gT29cUPAOiCeV7yGZLrB9ckCHGT/h6W3kB2RvxMwqLh4foxyOOh3PwKc4yOcYeAFG5 zWG4zHdfx0sA+JhQtkOd9SiZEoMA7I0yx2sCsIL+PNVmbQ9Fe42gakYShdcxvy0yQcYcyA 3H6reirvw5Eo1UEyY+uvcrsZNl7PHpX5nH9Cxoi3nMjSYBaOl5cXLEmG4ZBrVWcPhBllD9 uGeW1xvqO+RMc8jfJ1Vyc+I4pniAkln+M5+MdVXtLL2pF9bP1F/3WhzhBGxipq8f7TABpc fTUSdnrFLJLQ7QkuKg3mTG2WbIZbx3ZZ168BCMQwS9G1fB538QzJfJqFmOtSQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q9yWF4t3rz189G; Wed, 3 May 2023 00:29:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3430TTTn071809; Wed, 3 May 2023 00:29:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3430TTpu071808; Wed, 3 May 2023 00:29:29 GMT (envelope-from git) Date: Wed, 3 May 2023 00:29:29 GMT Message-Id: <202305030029.3430TTpu071808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 11a98ef22a4f - stable/13 - Explicitly set CXXSTD to c++11 for old C++ code using std::auto_ptr<>. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 11a98ef22a4f212747507cd0014e7dfb2d8db11f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=11a98ef22a4f212747507cd0014e7dfb2d8db11f commit 11a98ef22a4f212747507cd0014e7dfb2d8db11f Author: John Baldwin AuthorDate: 2022-11-30 22:56:19 +0000 Commit: John Baldwin CommitDate: 2023-05-02 23:47:59 +0000 Explicitly set CXXSTD to c++11 for old C++ code using std::auto_ptr<>. GCC 12 defaults to C++17 which removes (not just deprecates) std::auto_ptr<>. Trying to use CXXSTD of c++03 doesn't work with libc++ headers, but c++11 does. Reviewed by: brooks, imp, emaste Differential Revision: https://reviews.freebsd.org/D37531 (cherry picked from commit 42fb28cef42e883d808c9efadd44016563248817) --- lib/atf/Makefile.inc | 3 +++ lib/liblutok/Makefile | 1 + libexec/atf/atf-check/Makefile | 1 + usr.bin/kyua/Makefile | 1 + 4 files changed, 6 insertions(+) diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc index 392bbb23b236..5904a859a15c 100644 --- a/lib/atf/Makefile.inc +++ b/lib/atf/Makefile.inc @@ -28,3 +28,6 @@ CFLAGS+= -DHAVE_CONFIG_H WARNS?= 3 + +# Permit use of auto_ptr for compilers defaulting to C++17 or later +CXXSTD= c++11 diff --git a/lib/liblutok/Makefile b/lib/liblutok/Makefile index dccbcaf773e4..0071d7b55070 100644 --- a/lib/liblutok/Makefile +++ b/lib/liblutok/Makefile @@ -22,5 +22,6 @@ SHLIB_MAJOR= 0 # lutok uses auto_ptr CFLAGS+= -Wno-deprecated-declarations +CXXSTD= c++11 .include diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile index 6711d1744430..1a87a14f354d 100644 --- a/libexec/atf/atf-check/Makefile +++ b/libexec/atf/atf-check/Makefile @@ -41,6 +41,7 @@ CFLAGS+= -DATF_SHELL='"/bin/sh"' # Silence warnings about usage of deprecated std::auto_ptr CXXWARNFLAGS+= -Wno-deprecated-declarations +CXXSTD= c++11 LIBADD= atf_cxx diff --git a/usr.bin/kyua/Makefile b/usr.bin/kyua/Makefile index 966927709a06..e23899afd1e5 100644 --- a/usr.bin/kyua/Makefile +++ b/usr.bin/kyua/Makefile @@ -37,6 +37,7 @@ CFLAGS+= -I${SRCTOP}/contrib/lutok/include CFLAGS+= -I${SRCTOP}/contrib/sqlite3 # kyua uses auto_ptr CFLAGS+= -Wno-deprecated-declarations +CXXSTD= c++11 CFLAGS+= -DHAVE_CONFIG_H # We compile the kyua libraries as part of the main executable as this saves