From nobody Mon Dec 5 00:25:37 2022 X-Original-To: dev-commits-src-main@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 4NQPTY4NwMz4k1Q6; Mon, 5 Dec 2022 00:25:37 +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 4NQPTY3j9vz4NCh; Mon, 5 Dec 2022 00:25:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670199937; 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=Nafcqk7d7ofIHYnOHQHSYoWRUnETtRi3+LAXVAZ64NM=; b=AT5PZ3i429nWJr0Co+64bAaWQAhzrx2iR4179VBgYCxcgbUDf/N9akFLk4A/TshLyGQG5E OmhiBuT/a4t39dIyYfWVQuddAagHlUjQHE1q2rY6WKOsOi38jtDRmPuJmmeAFAUsZfu2kv oj3eRV1iQCZV7IbfoBzMs3Y9JQkcyvU9RrWZ/3RZYaSo65tl8onTQEjosql89HI2kbpxfp FjEFZ4hwBzw1ylO9xM7mvoWMctd8h4AISPALH5QGQXjFAbJ6kraFu5DxTNIApVFy7nX5pL tZkFp3iCPUIlf1EKawY7cRzbBbpPb+OYdBIJ/B0yPlLx3liuWFGXE6WPNk0BEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670199937; 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=Nafcqk7d7ofIHYnOHQHSYoWRUnETtRi3+LAXVAZ64NM=; b=guZSjqi8AK8wPdYvwAHFB27o5tWxH1D8f0mhQXzMCD1PjxtqIkAm6lQJ7EO1d1znVwXnxc JXI5UTS7wdrDabRsdPbPpc1pqCK57IZsNIxHiapoA3yOvznzK+NhTNcIJ7Tb1PAwWo42qy d8ozIHexfyu+RduX192xW4r1mpS0UBuRrEaOcntOT0VdgVWpSFthNUUid6eswJW/IRF+00 Irk1q3Gh7LMFt+K2363wh/8ANHlhGqpCP8DFKJVGVeqER8wPUdcVnV1f3hijf5xqEd9nS+ v0Ii/tU90BjAFkvSfN5mYBVobE/CcTyDPdE33oa8SzadDqpxSE5sGJy52P11Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670199937; a=rsa-sha256; cv=none; b=UMd+Yit5R90/rCtfbxBWBTSiTs1x5SjUWEDML67aaVKccvWHs8gjCOXpsVhJKtAsR4FfSA ZyBVPQLwLq+BqQzeFeXiiPcQKX7vTuNsR7Rr3F4Kxu7qWf0OykvgrFqTwaPDxQ7kfXuEtW fMSZq2VDM0OIYMKwTYXG4m1TVo/yPx3JwJXi013oQekCAbufbif8ud2MpNpUIrp7r9Wmc5 yzWbxxoV8UbIP56cX69Sm9CPW8UHwn37i5+VR9A0+TQwW93+9TvsNwjQUeQspwLvbMJz1E 6BK2Hnzlfg/0d52cshxC6R7QQRCt0Dy2DhTqEV/sFomFkns8Aq7UM3P1uxdDpA== 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 4NQPTY2WN5zdhR; Mon, 5 Dec 2022 00:25:37 +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 2B50PbA9060403; Mon, 5 Dec 2022 00:25:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B50PbRr060402; Mon, 5 Dec 2022 00:25:37 GMT (envelope-from git) Date: Mon, 5 Dec 2022 00:25:37 GMT Message-Id: <202212050025.2B50PbRr060402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 42fb28cef42e - main - Explicitly set CXXSTD to c++11 for old C++ code using std::auto_ptr<>. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 42fb28cef42e883d808c9efadd44016563248817 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=42fb28cef42e883d808c9efadd44016563248817 commit 42fb28cef42e883d808c9efadd44016563248817 Author: John Baldwin AuthorDate: 2022-11-30 22:56:19 +0000 Commit: John Baldwin CommitDate: 2022-12-05 00:25:21 +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 --- 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