From nobody Wed Aug 16 17:39:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwPR11w8z4qtVy; Wed, 16 Aug 2023 17:39:39 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwPQ72J3z3SGX; Wed, 16 Aug 2023 17:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692207579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r4yZM3oDSwGPJq7602dxoQpByfH4YTRZcxsqthXT9yo=; b=yQ3OZuyCydn+PG5qZ2gvJSrj/eMnBzwoTNbNddipmTJDTbyqaoSv6pfq/LKqtlcog9dQd1 seMocuzjo97O0gjJhBk4tdbiNI9rlpkN0gGGN17ZvPH0YqtK8eqXJS2Q3TW11gUThIiXCc 5e0/4Xp3ecW/LfDDui97MW63a5ynx8xR7KpJe7bNovCtR0sS8sf8TSogoY45LTl2rTNAOz pQll/3GNN29U62orf4GQQJ3fwCXNHOElMFJK+tYxHddb4Zkvy79XAoE1u0KOStQMfeN0FV KanLpKC+axEbEkCSVH+GNoF9sZE4IOITktFm+cQVFwT6oi+vX3nBr6wPAKTkbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692207579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r4yZM3oDSwGPJq7602dxoQpByfH4YTRZcxsqthXT9yo=; b=u6B9ri0KsA6WFZw2H9gToSLrI+R2lX+BrmsuuXT5IJBOxJCJHcb4u1BpIQkXZY4koar4Hs 9rB0c9oj0Dgk3xFF0cd5zOUL/tFENCUAhcrMR/PxqBL5f+i9nQT+cSioZg6cTaxxsFJzXR G/rA5iquw/Xu7I1MjE5+f2xocBc2VzNcHW0kC9ISFs+MQgEAyrfc4gBYTfH5es/GV0Aryd LjWzmnwdyeB0oT7+wk5fva9LUTf+KYYfte2I7yqfU+mhfsL+jAiJ0wxduY+cn+SkeSiF6g /ldnohjlTba3Vf6/t3lcW57GZSa0F3N0DxTRg91DIxUIJG2VrCGN6sJv34CPiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692207579; a=rsa-sha256; cv=none; b=QKvuJIDIYHlULgGFdT1HZQPGWFzbI3CR5N3y24GN25BS6Kba0EwnpFb9Ked3NtFc4JL5F4 ujjLHYFX+Ia1hcCV6xLbt83Z915T3lQBQBwJ4r3qeVWqvEr/taGx5SYfHSWJYGrAR3XXaz nYibfg0vdAkKzLNamlHAnmWAhOKvVRv5xHe6LTbAnldOsl9OMB+7pJASD/ubfGSfBTE41S o+gZCz0UaLwzMi7L3h4k0T08GUml1PMqTna6wML4zxI+IhXNDtwVUTOFqqCdZISDxGAjbC PSBezt6sYktcPr0zXDCf5Q5uV4ByTrrLIpTZ9+WJClPjLPO4901CEGDjP44GLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwPQ5zXZz11LY; Wed, 16 Aug 2023 17:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHdccd025932; Wed, 16 Aug 2023 17:39:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHdcX5025929; Wed, 16 Aug 2023 17:39:38 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:39:38 GMT Message-Id: <202308161739.37GHdcX5025929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: d5af300a69f1 - main - Fix incremental builds after GoogleTest update List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5af300a69f10e2cf9f1c03a317b7b49115927ed Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d5af300a69f10e2cf9f1c03a317b7b49115927ed commit d5af300a69f10e2cf9f1c03a317b7b49115927ed Author: Dimitry Andric AuthorDate: 2023-08-15 21:14:26 +0000 Commit: Dimitry Andric CommitDate: 2023-08-16 17:39:22 +0000 Fix incremental builds after GoogleTest update At the moment, several Makefiles under tests/ do not correctly generate .depend files, which can lead to link errors when doing incremental (e.g. WITHOUT_CLEAN) builds: ld: error: undefined symbol: testing::internal::g_linked_ptr_mutex >>> referenced by gtest-port.h:2137 (/usr/obj/usr/src/amd64.amd64/tmp/usr/include/private/gtest/internal/gtest-port.h:2137) >>> mockfs.o:(testing::internal::linked_ptr_internal::depart()) >>> referenced by gtest-port.h:2139 (/usr/obj/usr/src/amd64.amd64/tmp/usr/include/private/gtest/internal/gtest-port.h:2139) >>> mockfs.o:(testing::internal::linked_ptr_internal::depart()) >>> referenced by gtest-port.h:2139 (/usr/obj/usr/src/amd64.amd64/tmp/usr/include/private/gtest/internal/gtest-port.h:2139) >>> mockfs.o:(testing::internal::linked_ptr_internal::depart()) >>> referenced 3 more times For the time being, put in a depend-cleanup.sh workaround for this. Reported by: des Reviewed by: emaste Fixes: 28f6c2f29280 MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41476 --- tools/build/depend-cleanup.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 687f04f57f8c..6741c2285588 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -204,3 +204,10 @@ clean_dep lib/libc ffsll S clean_dep lib/libc fls S clean_dep lib/libc flsl S clean_dep lib/libc flsll S + +# 20230815 28f6c2f29280 GoogleTest update +if [ -e "$OBJTOP"/tests/sys/fs/fusefs/mockfs.o ] && \ + grep -q '_ZN7testing8internal18g_linked_ptr_mutexE' "$OBJTOP"/tests/sys/fs/fusefs/mockfs.o; then + echo "Removing stale fusefs GoogleTest objects" + run rm -rf "$OBJTOP"/tests/sys/fs/fusefs +fi