From owner-svn-src-projects@freebsd.org Thu Feb 21 06:49:21 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A630214F95DF for ; Thu, 21 Feb 2019 06:49:21 +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 4C62D91D27; Thu, 21 Feb 2019 06:49:21 +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 39C5519D5D; Thu, 21 Feb 2019 06:49:21 +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 x1L6nLvj013353; Thu, 21 Feb 2019 06:49:21 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1L6nKR9013351; Thu, 21 Feb 2019 06:49:20 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902210649.x1L6nKR9013351@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Thu, 21 Feb 2019 06:49:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344423 - in projects/import-googletest-1.8.1: lib/googletest share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1: lib/googletest share/mk X-SVN-Commit-Revision: 344423 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4C62D91D27 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Feb 2019 06:49:21 -0000 Author: ngie Date: Thu Feb 21 06:49:20 2019 New Revision: 344423 URL: https://svnweb.freebsd.org/changeset/base/344423 Log: Move `NO_WTHREAD_SAFETY` to googletest.test.inc.mk This variable is necessary to compile with googletest at a global level. Move it there. Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile.inc projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Modified: projects/import-googletest-1.8.1/lib/googletest/Makefile.inc ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/Makefile.inc Thu Feb 21 06:40:15 2019 (r344422) +++ projects/import-googletest-1.8.1/lib/googletest/Makefile.inc Thu Feb 21 06:49:20 2019 (r344423) @@ -8,6 +8,4 @@ GOOGLETEST_SRCROOT= ${GTEST_DIR}/googletest CXXFLAGS+= ${GTESTS_FLAGS} -NO_WTHREAD_SAFETY= - WARNS?= 6 Modified: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Thu Feb 21 06:40:15 2019 (r344422) +++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Thu Feb 21 06:49:20 2019 (r344423) @@ -10,3 +10,5 @@ GTESTS_CXXFLAGS+= -std=c++11 # XXX: src.libnames.mk should handle adding this directory. GTESTS_CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private + +NO_WTHREAD_SAFETY=