From owner-svn-src-user@freebsd.org  Tue Sep  3 14:06:39 2019
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id D6D79DCD52
 for <svn-src-user@mailman.nyi.freebsd.org>;
 Tue,  3 Sep 2019 14:06:39 +0000 (UTC)
 (envelope-from yuripv@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "freefall.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46N7zg2wfWz4Pmg;
 Tue,  3 Sep 2019 14:06:39 +0000 (UTC)
 (envelope-from yuripv@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1452)
 id CBC231A9AF; Tue,  3 Sep 2019 14:06:13 +0000 (UTC)
X-Original-To: yuripv@localmail.freebsd.org
Delivered-To: yuripv@localmail.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
 (Client CN "mx1.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by freefall.freebsd.org (Postfix) with ESMTPS id 7E82F1895F;
 Wed, 10 Apr 2019 22:16:56 +0000 (UTC)
 (envelope-from owner-src-committers@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "freefall.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 42A918E8D2;
 Wed, 10 Apr 2019 22:16:56 +0000 (UTC)
 (envelope-from owner-src-committers@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 538)
 id 1A3441895D; Wed, 10 Apr 2019 22:16:56 +0000 (UTC)
Delivered-To: src-committers@localmail.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
 (Client CN "mx1.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by freefall.freebsd.org (Postfix) with ESMTPS id 7A5921895B
 for <src-committers@localmail.freebsd.org>;
 Wed, 10 Apr 2019 22:16:53 +0000 (UTC)
 (envelope-from ngie@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)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 337868E8CE;
 Wed, 10 Apr 2019 22:16:53 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 07F88DCF;
 Wed, 10 Apr 2019 22:16:53 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3AMGqGH005912;
 Wed, 10 Apr 2019 22:16:52 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3AMGp7e005901;
 Wed, 10 Apr 2019 22:16:51 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201904102216.x3AMGp7e005901@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Enji Cooper <ngie@FreeBSD.org>
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r346107 - in user/ngie/fix-up-cxxstd: lib/libc++
 lib/libc++experimental lib/libc++fs lib/libcxxrt lib/libgcc_eh
 lib/ofed/libibnetdisc share/mk usr.bin/dtc
X-SVN-Group: user
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: in user/ngie/fix-up-cxxstd: lib/libc++
 lib/libc++experimental lib/libc++fs lib/libcxxrt lib/libgcc_eh
 lib/ofed/libibnetdisc share/mk usr.bin/dtc
X-SVN-Commit-Revision: 346107
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk
X-Loop: FreeBSD.org
Sender: owner-src-committers@freebsd.org
X-Rspamd-Queue-Id: 42A918E8D2
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.95 / 15.00];
 local_wl_from(0.00)[freebsd.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.998,0];
 NEURAL_HAM_SHORT(-0.96)[-0.955,0];
 NEURAL_HAM_LONG(-1.00)[-1.000,0];
 ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]
Status: O
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.29
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
Date: Tue, 03 Sep 2019 14:06:40 -0000
X-Original-Date: Wed, 10 Apr 2019 22:16:51 +0000 (UTC)
X-List-Received-Date: Tue, 03 Sep 2019 14:06:40 -0000

Author: ngie
Date: Wed Apr 10 22:16:50 2019
New Revision: 346107
URL: https://svnweb.freebsd.org/changeset/base/346107

Log:
  Set the C++ standard in a manner similar to how it was set, pre-r345708
  
  Some cases overrode -std if specified; some cases would be overridden if
  specified. Be bug compatible.

Modified:
  user/ngie/fix-up-cxxstd/lib/libc++/Makefile
  user/ngie/fix-up-cxxstd/lib/libc++experimental/Makefile
  user/ngie/fix-up-cxxstd/lib/libc++fs/Makefile
  user/ngie/fix-up-cxxstd/lib/libcxxrt/Makefile
  user/ngie/fix-up-cxxstd/lib/libgcc_eh/Makefile.inc
  user/ngie/fix-up-cxxstd/lib/ofed/libibnetdisc/Makefile
  user/ngie/fix-up-cxxstd/share/mk/googletest.test.inc.mk
  user/ngie/fix-up-cxxstd/usr.bin/dtc/Makefile

Modified: user/ngie/fix-up-cxxstd/lib/libc++/Makefile
==============================================================================
--- user/ngie/fix-up-cxxstd/lib/libc++/Makefile	Wed Apr 10 21:46:59 2019	(r346106)
+++ user/ngie/fix-up-cxxstd/lib/libc++/Makefile	Wed Apr 10 22:16:50 2019	(r346107)
@@ -76,7 +76,7 @@ CFLAGS+=	-nostdinc++
 CFLAGS+=	-nostdlib
 CFLAGS+=	-D_LIBCPP_BUILDING_LIBRARY
 CFLAGS+=	-DLIBCXXRT
-CXXSTD=		c++11
+CXXSTD?=	c++11
 
 LIBADD+=	cxxrt
 INCSGROUPS=	STD EXP EXT

Modified: user/ngie/fix-up-cxxstd/lib/libc++experimental/Makefile
==============================================================================
--- user/ngie/fix-up-cxxstd/lib/libc++experimental/Makefile	Wed Apr 10 21:46:59 2019	(r346106)
+++ user/ngie/fix-up-cxxstd/lib/libc++experimental/Makefile	Wed Apr 10 22:16:50 2019	(r346107)
@@ -20,6 +20,6 @@ CXXFLAGS+=	-nostdinc++
 CXXFLAGS+=	-nostdlib
 CXXFLAGS+=	-D_LIBCPP_BUILDING_LIBRARY
 CXXFLAGS+=	-DLIBCXXRT
-CXXSTD=		c++14
+CXXSTD?=	c++14
 
 .include <bsd.lib.mk>

Modified: user/ngie/fix-up-cxxstd/lib/libc++fs/Makefile
==============================================================================
--- user/ngie/fix-up-cxxstd/lib/libc++fs/Makefile	Wed Apr 10 21:46:59 2019	(r346106)
+++ user/ngie/fix-up-cxxstd/lib/libc++fs/Makefile	Wed Apr 10 22:16:50 2019	(r346107)
@@ -22,6 +22,6 @@ CXXFLAGS+=	-nostdinc++
 CXXFLAGS+=	-nostdlib
 CXXFLAGS+=	-D_LIBCPP_BUILDING_LIBRARY
 CXXFLAGS+=	-DLIBCXXRT
-CXXSTD=		c++14
+CXXSTD?=	c++14
 
 .include <bsd.lib.mk>

Modified: user/ngie/fix-up-cxxstd/lib/libcxxrt/Makefile
==============================================================================
--- user/ngie/fix-up-cxxstd/lib/libcxxrt/Makefile	Wed Apr 10 21:46:59 2019	(r346106)
+++ user/ngie/fix-up-cxxstd/lib/libcxxrt/Makefile	Wed Apr 10 22:16:50 2019	(r346107)
@@ -22,7 +22,7 @@ SRCS+=		libelftc_dem_gnu3.c\
 
 WARNS=		0
 CFLAGS+=	-isystem ${SRCDIR} -nostdinc++
-CXXSTD=		c++11
+CXXSTD?=	c++11
 VERSION_MAP=	${.CURDIR}/Version.map
 
 .include <bsd.lib.mk>

Modified: user/ngie/fix-up-cxxstd/lib/libgcc_eh/Makefile.inc
==============================================================================
--- user/ngie/fix-up-cxxstd/lib/libgcc_eh/Makefile.inc	Wed Apr 10 21:46:59 2019	(r346106)
+++ user/ngie/fix-up-cxxstd/lib/libgcc_eh/Makefile.inc	Wed Apr 10 22:16:50 2019	(r346107)
@@ -28,7 +28,7 @@ CXXFLAGS.${file}+=	-fno-exceptions -funwind-tables
 
 CFLAGS+=	-I${UNWINDINCDIR} -I${.CURDIR} -D_LIBUNWIND_IS_NATIVE_ONLY
 CXXFLAGS+=	-fno-rtti
-CXXSTD=		c++11
+CXXSTD?=	c++11
 STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC
 # Probably need to just move this earlier or use CXXFLAGS
 .if ${MK_DIRDEPS_BUILD} == "yes"

Modified: user/ngie/fix-up-cxxstd/lib/ofed/libibnetdisc/Makefile
==============================================================================
--- user/ngie/fix-up-cxxstd/lib/ofed/libibnetdisc/Makefile	Wed Apr 10 21:46:59 2019	(r346106)
+++ user/ngie/fix-up-cxxstd/lib/ofed/libibnetdisc/Makefile	Wed Apr 10 22:16:50 2019	(r346107)
@@ -31,6 +31,9 @@ LIBADD=		osmcomp ibmad ibumad
 CFLAGS+=	-DHAVE_CONFIG_H=1
 CFLAGS+=	-I${_spath}
 CFLAGS+=	-I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband
+.if ${COMPILER_FEATURES:Mc++11}
+CXXSTD=		c++11
+.endif
 VERSION_MAP=	${_spath}/libibnetdisc.map
 
 .include <bsd.lib.mk>

Modified: user/ngie/fix-up-cxxstd/share/mk/googletest.test.inc.mk
==============================================================================
--- user/ngie/fix-up-cxxstd/share/mk/googletest.test.inc.mk	Wed Apr 10 21:46:59 2019	(r346106)
+++ user/ngie/fix-up-cxxstd/share/mk/googletest.test.inc.mk	Wed Apr 10 22:16:50 2019	(r346107)
@@ -9,4 +9,6 @@ GTESTS_CXXFLAGS+= -frtti
 # libgmock's, etc, headers.
 CXXFLAGS+=	-I${DESTDIR}${INCLUDEDIR}/private
 
+CXXSTD?=	c++11
+
 NO_WTHREAD_SAFETY=

Modified: user/ngie/fix-up-cxxstd/usr.bin/dtc/Makefile
==============================================================================
--- user/ngie/fix-up-cxxstd/usr.bin/dtc/Makefile	Wed Apr 10 21:46:59 2019	(r346106)
+++ user/ngie/fix-up-cxxstd/usr.bin/dtc/Makefile	Wed Apr 10 22:16:50 2019	(r346107)
@@ -8,6 +8,8 @@ WARNS?=	3
 
 CXXFLAGS+=	-fno-rtti -fno-exceptions
 
+CXXSTD=	c++11
+
 NO_SHARED?=NO
 
 .include <bsd.prog.mk>