From nobody Fri Oct 10 20:51:07 2025 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 4cjzRc1qVnz6Bxlx; Fri, 10 Oct 2025 20:51:08 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cjzRc1BXGz49Qb; Fri, 10 Oct 2025 20:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760129468; 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=gcaPN8YDpX/hsC4HzgOl65Acg2kjRgIWdpN7i+HGSME=; b=WLXYCQhlAFKr3NqkpGwPa2J0FiAqmgpp8O8SBuXqCtoB8ogCrJgCKfQkJ9KM4pMzsjzf3Q IRzIAjrPHGQC7PiIBN7633jZosJrfyAe0XZCmd4IoU0JXmaIsEXhYTxNpfDqRV+vzrKMGd ROkIVpkDJXxoYhGs7fJqYMPKykb/4jK5n3yXjG5XK3Y4yDZt+Vx5MhgWeX8feYBy+dZQIn yfM14uWSCSixiceXRHrSNJalJQPbCkk4TL0voZcRfOHXCQyllAShdp5N5ynFmlJY4ZaFb4 WrmM49txyGGsBUHSZVmHQMblr8rsa+ybC+amVI5LZD96WfM74tUy1hLlj+Zfiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760129468; 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=gcaPN8YDpX/hsC4HzgOl65Acg2kjRgIWdpN7i+HGSME=; b=QomSCn66z8UHPugS1Q7ma7TetzP32V770O7P+6aA2rRE5o5pc+8e5nt7HDFkCmV4f6GaPI ht4ZMeITiJ6iyRoib2CYO9IQ9jXSDJNrSR3Hd82BCZnwMK1Q55ue+EBFP+NMxloEjBaAl/ pPcUwy8HqzXJ8CxLsrMVaIlZnx084Vrk1hIe5dM3Nbxn/uKiPV5UO1cPE6QS9LHuuR+qs/ /DZCAwEJkgAYFsVX7kGrAzJn6FegVuP+r+w3Mp+oGCy/XvIICpjxHmf51HTLZT3RwblzsR fTuckPwu59NX+gl0L6CR8PeHg+Q0da7mm5Y+sqmk0/hruCR9seLZshCl0AluQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760129468; a=rsa-sha256; cv=none; b=LI+Neoqj3tYa8Oo1ToRguXreDHg4QBz6vj4WSsD4NmY/kRRAm8xEeVVNFJ7LoIeC6CDBSY wUp5qcgA4v/h93Bv8/M5PMvj7/Xv1nEBFJ2hBNdRgolBjBe3I7vcya3ssVd4mvphUKT7t+ cZIUUIDUqqcfMA3unDaiCptrycjgm2biemgc8H973bEqfIX6NMlU7ZkvsJnem0DONt6Nb6 vdncRty0N58wThNzU7rg8cIU6VvwQEPhX3FhVUfN8kUL6AQYKSHL+8MPrRuvQKam74xFh/ td4fqLiDiKeG5BIUcCG1gKAE09GNziSErMPsfnbK/YndRhbH21FBME3mNe+1LQ== 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 4cjzRc0dDVz1Hwq; Fri, 10 Oct 2025 20:51:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59AKp7po014634; Fri, 10 Oct 2025 20:51:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59AKp7XD014631; Fri, 10 Oct 2025 20:51:07 GMT (envelope-from git) Date: Fri, 10 Oct 2025 20:51:07 GMT Message-Id: <202510102051.59AKp7XD014631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 9934558460e4 - main - sockstat: Fix build reproducibility 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9934558460e4e73e5b55648c4b13a702f4f019d7 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=9934558460e4e73e5b55648c4b13a702f4f019d7 commit 9934558460e4e73e5b55648c4b13a702f4f019d7 Author: Colin Percival AuthorDate: 2025-10-10 20:13:58 +0000 Commit: Colin Percival CommitDate: 2025-10-10 20:50:45 +0000 sockstat: Fix build reproducibility Both usr.bin/sockstat and usr.bin/sockstat/tests build the file src/usr.bin/sockstat/sockstat.c. Unfortunately, they place the resulting object file in the same place, but produce different files due to paths appearing in the .debug files; this results in different binaries depending on how the race between the two builds ends. Use .PATH to tell make to find sockstat.c in the parent directory but place the object file in the current object directory, rather than placing '..' into the name of the source file. Suggested by: bdrewery, emaste, jrtc27 MFC after: 5 minutes (15.0 build fix) Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D53032 --- usr.bin/sockstat/tests/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/sockstat/tests/Makefile b/usr.bin/sockstat/tests/Makefile index 9971bca2d474..5412e9d842aa 100644 --- a/usr.bin/sockstat/tests/Makefile +++ b/usr.bin/sockstat/tests/Makefile @@ -1,5 +1,6 @@ ATF_TESTS_C+= sockstat_test -SRCS.sockstat_test= sockstat_test.c ../sockstat.c +SRCS.sockstat_test= sockstat_test.c sockstat.c +.PATH: ${.CURDIR:H} LIBADD= xo