From nobody Fri Oct 10 20:51:55 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 4cjzSW5pWlz6ByDJ; Fri, 10 Oct 2025 20:51:55 +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 4cjzSW5DXJz4B1L; Fri, 10 Oct 2025 20:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760129515; 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=npSjfma9jrszVghf11piM0gzMbpD6YxhTgVPdDUGRmk=; b=QyrrUNw5URlHvjYAGBWzt+Fo6MxF9g8zRwlWuidodJChwFmsPY6P7kT01EKF207QkfQHLR dd3WIrMfSQc+/laPjLJv78IGtfALaWkq4mSd7dkj5XcqOXEzjxxwA9RiO3K2ZMGn4qPBei yZfgcfbfq5TExaHDixCmKNI4t1/PD7bDHhlHfEgbtJbHqP2l9wtZYZB3Uh7JzyROjSBErY TGCssqubF63YGWz0EPJIdYpFy31IJ+6uZu6TzaBrRdYNaznVJrSAUaSdD6m7KBQDnFL46G j7KtV5g3gjtMw2HVuHJ//dmqZA6+USW530Uo+CDZKeu+UfJ3PZi+RA29AI9pSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760129515; 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=npSjfma9jrszVghf11piM0gzMbpD6YxhTgVPdDUGRmk=; b=DrMaAshOdBnGJ9ddGtRiZIyfvFOV7/OxAkVBYkMjMVVPYkos3s6uZ8b6Cwur+PtBQms1XJ MIyr7qmlR5eG4V3puZKzuiIVjAtxQU/0jKNSJQy80jOxLlTtNRC4UX/V5zJkkU6jvY1OJq LjPZBtH/eeqaycfi8sPMrzw1sZrJer+Ex1lWauv3urUqQksaSjaP6wiPxTVQ3ebyzQh5nr tqme/QujWGGGe+R0d/ISE0XNEiROIgN4C0O+joEvOrMx1yRq3OH4LhjOIdhChG+2eLeRX9 0TzkXJM7zNy/ZOH021OlF1sdAD5yCq3QyYoYx3NGbn/pLcrTc01gUoVpilF1ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760129515; a=rsa-sha256; cv=none; b=NNU07CcHaztHsA2c4ORavwM2DjoIoPFB4Ti6rfvc2VoJHrTv0KB8yqTApJ46rQCas5B37c Z/9sJ/QS0tgYn3RXF+G1fYyXDr1v9dkF2p87U9UF2MhaaDXNAHjav4sIWG5zWLZ4A/eIYU DLo0k9Oo9RkOfp54M3twBAS+bjH0CZ3C2A2KqMRnmwQ3zwuRwhIw0ZRnGRAfNSllKIzypI O/SkKbnCa/dNDTOKP90tAHMqmzcI2qPPmBD1CnPepnBSsTrFCTGwyNotCiH1cRl5YqINWY i0BJAPMy6I9pPNoJ5oBTki5ySNSPLqHH+qV58AKdgpwqtV6gFSTvVMRh5wUqxQ== 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 4cjzSW4lH2z1JJg; Fri, 10 Oct 2025 20:51:55 +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 59AKptLs019575; Fri, 10 Oct 2025 20:51:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59AKpt4I019572; Fri, 10 Oct 2025 20:51:55 GMT (envelope-from git) Date: Fri, 10 Oct 2025 20:51:55 GMT Message-Id: <202510102051.59AKpt4I019572@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0abc05296636 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 0abc05296636fe5fd7dbe88c7bc06413434da730 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0abc05296636fe5fd7dbe88c7bc06413434da730 commit 0abc05296636fe5fd7dbe88c7bc06413434da730 Author: Colin Percival AuthorDate: 2025-10-10 20:13:58 +0000 Commit: Colin Percival CommitDate: 2025-10-10 20:51:44 +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 (cherry picked from commit 9934558460e4e73e5b55648c4b13a702f4f019d7) --- 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