From owner-svn-src-projects@freebsd.org Fri Feb 22 04:52:12 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 E072114FF7B9 for ; Fri, 22 Feb 2019 04:52:12 +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 7E70281612; Fri, 22 Feb 2019 04:52:12 +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 744714B9; Fri, 22 Feb 2019 04:52:12 +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 x1M4qCCU010419; Fri, 22 Feb 2019 04:52:12 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1M4qC98010418; Fri, 22 Feb 2019 04:52:12 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902220452.x1M4qC98010418@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Fri, 22 Feb 2019 04:52:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344457 - projects/import-googletest-1.8.1/share/mk X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: projects/import-googletest-1.8.1/share/mk X-SVN-Commit-Revision: 344457 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7E70281612 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.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.955,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] 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: Fri, 22 Feb 2019 04:52:13 -0000 Author: ngie Date: Fri Feb 22 04:52:12 2019 New Revision: 344457 URL: https://svnweb.freebsd.org/changeset/base/344457 Log: Remove redundant CXXFLAGS and fix constant names - Specifying -std=c++11 and -frtti tweaks those flags with clang/gcc. - The constants are prefixed with `GTEST_`, not `GTESTS_`. Modified: projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk 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 Fri Feb 22 03:11:27 2019 (r344456) +++ projects/import-googletest-1.8.1/share/mk/googletest.test.inc.mk Fri Feb 22 04:52:12 2019 (r344457) @@ -1,10 +1,8 @@ # $FreeBSD$ -GTESTS_CXXFLAGS+= -DGTESTS_HAS_RTTI=1 -GTESTS_CXXFLAGS+= -DGTESTS_HAS_POSIX_RE=1 -GTESTS_CXXFLAGS+= -DGTESTS_HAS_PTHREAD=1 -GTESTS_CXXFLAGS+= -DGTESTS_HAS_STREAM_REDIRECTION=1 -GTESTS_CXXFLAGS+= -DGTESTS_LANG_CXX11=1 +GTESTS_CXXFLAGS+= -DGTEST_HAS_POSIX_RE=1 +GTESTS_CXXFLAGS+= -DGTEST_HAS_PTHREAD=1 +GTESTS_CXXFLAGS+= -DGTEST_HAS_STREAM_REDIRECTION=1 GTESTS_CXXFLAGS+= -frtti GTESTS_CXXFLAGS+= -std=c++11