From owner-svn-src-projects@freebsd.org Tue Feb 19 22:40:34 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 154EF14DC64A for ; Tue, 19 Feb 2019 22:40:34 +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 834ED77B5B; Tue, 19 Feb 2019 22:40:33 +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 74613244E4; Tue, 19 Feb 2019 22:40:33 +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 x1JMeXgX049406; Tue, 19 Feb 2019 22:40:33 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1JMeWWZ049403; Tue, 19 Feb 2019 22:40:32 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902192240.x1JMeWWZ049403@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Tue, 19 Feb 2019 22:40:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344312 - in projects/import-googletest-1.8.1: lib share/man/man5 share/mk tools/build/options X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1: lib share/man/man5 share/mk tools/build/options X-SVN-Commit-Revision: 344312 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 834ED77B5B X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.979,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,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: Tue, 19 Feb 2019 22:40:34 -0000 Author: ngie Date: Tue Feb 19 22:40:32 2019 New Revision: 344312 URL: https://svnweb.freebsd.org/changeset/base/344312 Log: Add MK_GOOGLETEST option for building/installing gmock/gtest These libraries don't compile on non-C++-11 capable compilers, e.g., g++ 4.2.1 and its corresponding implementation of the c++ library, i.e., libstdc++. Blacklist compilation on all non-C++-11 capable compilers and give others the option of opting out of building/installing gmock/gtest via MK_GOOGLETEST. This option is controlled by MK_CXX and MK_TESTS, as ATF compilation is. Added: projects/import-googletest-1.8.1/tools/build/options/WITHOUT_GOOGLETEST (contents, props changed) Modified: projects/import-googletest-1.8.1/lib/Makefile projects/import-googletest-1.8.1/share/man/man5/src.conf.5 projects/import-googletest-1.8.1/share/mk/src.opts.mk Modified: projects/import-googletest-1.8.1/lib/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/Makefile Tue Feb 19 22:35:14 2019 (r344311) +++ projects/import-googletest-1.8.1/lib/Makefile Tue Feb 19 22:40:32 2019 (r344312) @@ -169,6 +169,7 @@ _libcplusplus+= libc++fs .endif SUBDIR.${MK_EFI}+= libefivar +SUBDIR.${MK_GOOGLETEST}+= googletest SUBDIR.${MK_LIBTHR}+= libthr SUBDIR.${MK_LLVM_LIBUNWIND}+= libgcc_eh SUBDIR.${MK_LLVM_LIBUNWIND}+= libgcc_s @@ -200,7 +201,6 @@ SUBDIR.${MK_RADIUS_SUPPORT}+= libradius SUBDIR.${MK_SENDMAIL}+= libmilter libsm libsmdb libsmutil SUBDIR.${MK_TELNET}+= libtelnet SUBDIR.${MK_TESTS_SUPPORT}+= atf -SUBDIR.${MK_TESTS_SUPPORT}+= googletest SUBDIR.${MK_TESTS}+= tests SUBDIR.${MK_UNBOUND}+= libunbound SUBDIR.${MK_USB}+= libusbhid libusb Modified: projects/import-googletest-1.8.1/share/man/man5/src.conf.5 ============================================================================== --- projects/import-googletest-1.8.1/share/man/man5/src.conf.5 Tue Feb 19 22:35:14 2019 (r344311) +++ projects/import-googletest-1.8.1/share/man/man5/src.conf.5 Tue Feb 19 22:40:32 2019 (r344312) @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd February 15, 2019 +.Dd February 19, 2019 .Dt SRC.CONF 5 .Os .Sh NAME @@ -529,6 +529,8 @@ When set, it enforces these options: .It .Va WITHOUT_GNUCXX .It +.Va WITHOUT_GOOGLETEST +.It .Va WITHOUT_LLVM_COV .It .Va WITHOUT_TESTS @@ -807,6 +809,11 @@ Set to not build GNU Set this option to include GNU extensions in .Xr bsdgrep 1 by linking against libgnuregex. +.It Va WITHOUT_GOOGLETEST +Set to not build nor install +.Lb libgmock , +.Lb libgtest , +and dependent tests. .It Va WITHOUT_GPIO Set to not build .Xr gpioctl 8 @@ -1784,6 +1791,8 @@ When set, it enforces these options: .Bl -item -compact .It .Va WITHOUT_DTRACE_TESTS +.It +.Va WITHOUT_GOOGLETEST .El .Pp When set, these options are also in effect: Modified: projects/import-googletest-1.8.1/share/mk/src.opts.mk ============================================================================== --- projects/import-googletest-1.8.1/share/mk/src.opts.mk Tue Feb 19 22:35:14 2019 (r344311) +++ projects/import-googletest-1.8.1/share/mk/src.opts.mk Tue Feb 19 22:40:32 2019 (r344312) @@ -108,6 +108,7 @@ __DEFAULT_YES_OPTIONS = \ GDB \ GNU_DIFF \ GNU_GREP \ + GOOGLETEST \ GPIO \ HAST \ HTML \ @@ -423,6 +424,7 @@ MK_${var}:= no # Order is somewhat important. # .if !${COMPILER_FEATURES:Mc++11} +MK_GOOGLETEST:= no MK_LLVM_LIBUNWIND:= no .endif @@ -505,6 +507,7 @@ MK_FREEBSD_UPDATE:= no .if ${MK_TESTS} == "no" MK_DTRACE_TESTS:= no +MK_GOOGLETEST:= no .endif .if ${MK_ZONEINFO} == "no" Added: projects/import-googletest-1.8.1/tools/build/options/WITHOUT_GOOGLETEST ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/import-googletest-1.8.1/tools/build/options/WITHOUT_GOOGLETEST Tue Feb 19 22:40:32 2019 (r344312) @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build nor install +.Lb libgmock , +.Lb libgtest , +and dependent tests.