From owner-svn-src-projects@freebsd.org Wed Feb 20 00:19: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 55D0814DF371 for ; Wed, 20 Feb 2019 00:19: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 EB82D83813; Wed, 20 Feb 2019 00:19:11 +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 C622A255F7; Wed, 20 Feb 2019 00:19:11 +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 x1K0JBZJ001655; Wed, 20 Feb 2019 00:19:11 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1K0JBJ8001654; Wed, 20 Feb 2019 00:19:11 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201902200019.x1K0JBJ8001654@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Wed, 20 Feb 2019 00:19:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r344324 - in projects/import-googletest-1.8.1/lib/googletest: gmock_main gtest_main X-SVN-Group: projects X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: in projects/import-googletest-1.8.1/lib/googletest: gmock_main gtest_main X-SVN-Commit-Revision: 344324 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EB82D83813 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_SHORT(-0.97)[-0.967,0]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; 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: Wed, 20 Feb 2019 00:19:12 -0000 Author: ngie Date: Wed Feb 20 00:19:11 2019 New Revision: 344324 URL: https://svnweb.freebsd.org/changeset/base/344324 Log: Fix up dependency finding for libg{mock,test}_main - Look up the corresponding non-*_main libraries via LDFLAGS using the directories provided in src.libnames.mk. This will allow the libraries to be built in the "make libraries" phase of buildworld. - gtest_main relies on gtest, but didn't explicitly call out the dependency in `LIBADD`. Fill in this missing blank. Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile Modified: projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile Wed Feb 20 00:15:25 2019 (r344323) +++ projects/import-googletest-1.8.1/lib/googletest/gmock_main/Makefile Wed Feb 20 00:19:11 2019 (r344324) @@ -12,7 +12,11 @@ CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT}/include CXXFLAGS+= -I${GOOGLEMOCK_SRCROOT} CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include -LIBADD= gmock +LIBADD+= gmock +# NB: LDFLAGS added for buildworld builds +LDFLAGS+= -L${LIBGTESTDIR} +LDFLAGS+= -L${LIBGMOCKDIR} + SRCS+= gmock_main.cc SUBDIR.${MK_TESTS}+= tests Modified: projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile ============================================================================== --- projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile Wed Feb 20 00:15:25 2019 (r344323) +++ projects/import-googletest-1.8.1/lib/googletest/gtest_main/Makefile Wed Feb 20 00:19:11 2019 (r344324) @@ -11,6 +11,10 @@ PRIVATELIB= true CXXFLAGS+= -I${GOOGLETEST_SRCROOT}/include CXXFLAGS+= -I${GOOGLETEST_SRCROOT} +LIBADD+= gtest +# NB: LDFLAGS added for buildworld builds +LDFLAGS+= -L${LIBGTESTDIR} + SRCS+= gtest_main.cc SUBDIR.${MK_TESTS}+= tests