From nobody Mon Jul 14 14:46:27 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 4bglWS1Gdmz61qZY; Mon, 14 Jul 2025 14:46:28 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bglWS0bKhz48vg; Mon, 14 Jul 2025 14:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752504388; 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=bGJY+4TrVgkk1fzJ6d3CrEMl8ZXylgHvPtlu2/Ut7pU=; b=f2d5xK1ZWa2K4ARo85KjJchNNJa12axOZDxAia/DUzRFDmCxDUJ/Jl7Jcot1MGWrOstLPC 1x7vpS4+t3QtDRbI9pQcKFwkk0wWqw+k2M1Y3ZaFEyh2uSNYYpG9MlbcNb3r61nDbasWN5 7lUUoyn3MBiN3JQGbAQUMh5rZ3KEiLRu2wsb4xvYiyTRFl7fGxxJg8PAO8fAi3obVqZWbj OkfEMl+M39wLIb3LzV5a1iSAdHggb0UWhrW18/Kc8OaZPMsVxidQzY1QoJihV28umLLLU6 4b1LIKP0JKq87JFt/A3YSEtR0hlX79P0uL3z7Io+TSCVBQrtj14elMcG8lvHaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752504388; 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=bGJY+4TrVgkk1fzJ6d3CrEMl8ZXylgHvPtlu2/Ut7pU=; b=AA6mwEj7GhT/P7psF6hhYuFd8fp8rcralsRvKJfH8bk6nY6CGJuJ8ghUE8+al0X9yVAq4r qs2PGgcVvPY8gMa5pkx6oa7kfXm+Hx4qNRuAH6BEO8Jf95kYSEFI8CdNgC6CSwHkW40uWo xsHI1d1yHlnj8YwsxwlGDopO8h29YIWmhYg6ZQ78ADvDnCyNwhhXbxI7hJ5ZGT0VlcCukc 80gJIdyEbrOR/zPvyP9NEGN2mzF2LG8fqrE+OvNmYLKlXvGBwNnENjzMSjqy7C1c1kwOzA f16ueh0da6z7leFD/Mm/hNl2wuyCrASKEBsgFidL3TeS8zDOnOsfmwBHW3k4sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752504388; a=rsa-sha256; cv=none; b=M5XvSDJuudQV2QpdtUz3s645smYOde6KhL6f8axCGN7Oo49Ow4WYQhoDx0nE6VK4Mqv45o trmFfgKNHYwfIkcgFgH8wDsepKYJP1lOAgmqeqRvl21vmPTIfYd4Gq3rs/Pf19IB44zEgn zNdQfaRyWGPqPaLRhHVgVfOyVb9o6zaZhm0lqNtUXZPa8jYvsmgdGfaGxTOM0p+Mfnj1YB j8uRp7fdsKOgzdkMu2V754KS1TWdZYWl+l8DPJxRP8aLg3Scl7NTn7dLjkYwkrUsoEWZ7h F2JB6zkWBy74o0tJ6tkV1kaCUXxsPxb75zg79gjWrVnDMRbucAPJPyzWHbPgRw== 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 4bglWR6nZfzyPC; Mon, 14 Jul 2025 14:46:27 +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 56EEkRUO038094; Mon, 14 Jul 2025 14:46:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56EEkRhm038091; Mon, 14 Jul 2025 14:46:27 GMT (envelope-from git) Date: Mon, 14 Jul 2025 14:46:27 GMT Message-Id: <202507141446.56EEkRhm038091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1cc020eba69e - main - ncurses: Provide reproducible paths 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1cc020eba69e8c3216683b41487600c6c958cbb0 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1cc020eba69e8c3216683b41487600c6c958cbb0 commit 1cc020eba69e8c3216683b41487600c6c958cbb0 Author: Mark Johnston AuthorDate: 2025-07-14 14:45:57 +0000 Commit: Mark Johnston CommitDate: 2025-07-14 14:45:57 +0000 ncurses: Provide reproducible paths Avoid hard-coding the value of SRCTOP in generated files. Use /usr/src as the canonical srcdir. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50955 --- lib/ncurses/tinfo/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile index 920bd6e5559c..476df54bb72a 100644 --- a/lib/ncurses/tinfo/Makefile +++ b/lib/ncurses/tinfo/Makefile @@ -259,10 +259,18 @@ term.h: MKterm.h.awk edit_cfg.sh Caps Caps-ncurses sh ${NCURSES_DIR}/include/edit_cfg.sh ${NCURSES_CFG_H} $@.new mv -f $@.new $@ +# Avoid hard-coding absolute source paths if requested. +.if ${MK_REPRODUCIBLE_BUILD} != "no" +NCURSES_SRCTOP=/usr/src +.else +NCURSES_SRCTOP=${SRCTOP} +.endif + curses.h: curses.head MKkey_defs.sh Caps Caps-ncurses cat curses.head > $@.new AWK=${AWK} _POSIX2_VERSION=199209 sh ${NCURSES_DIR}/include/MKkey_defs.sh \ ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/include/Caps-ncurses >> $@.new + sed -i '' 's|${SRCTOP}|${NCURSES_SRCTOP}|g' $@.new cat ${NCURSES_DIR}/include/curses.wide >> $@.new cat ${NCURSES_DIR}/include/curses.tail >> $@.new mv -f $@.new $@ @@ -387,6 +395,7 @@ unctrl.h: unctrl.h.in terminfo.5: MKterminfo.sh terminfo.head Caps sh ${NCURSES_DIR}/man/MKterminfo.sh ${NCURSES_DIR}/man/terminfo.head \ ${NCURSES_DIR}/include/Caps ${NCURSES_DIR}/man/terminfo.tail >$@ + sed -i '' 's|${SRCTOP}|${NCURSES_SRCTOP}|g' $@ CLEANFILES+= terminfo.5