git: 7626ba028089 - stable/15 - src.opts.mk: Remove REPRODUCIBLE_BUILD from the default list
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 08 Sep 2025 21:11:03 UTC
The branch stable/15 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=7626ba028089b97b5bb204b5203ee8fa24f63c48
commit 7626ba028089b97b5bb204b5203ee8fa24f63c48
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-09-07 15:44:53 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-09-08 20:56:37 +0000
src.opts.mk: Remove REPRODUCIBLE_BUILD from the default list
It was added to the list in bsd.opts.mk in commit 4f81c42fbd76, so
should have been removed here.
On stable/15, this also fixes a problem in commit
6e7cc49f94cf ("Make stable/15 a stable branch"), which made
REPRODUCIBLE_BUILD a default-yes option. It modified src.opts.mk
instead of bsd.opts.mk. This change modifies the latter accordingly.
Reported by: cperciva
Approved by: re (cperciva)
Fixes: 4f81c42fbd76 ("share/mk: Substitute reproducible prefixes in dwarf info")
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Sponsored by: Klara, Inc.
(cherry picked from commit b2f5dc591ef2547ee2e9b68e58a263cd34948db1)
---
share/mk/bsd.opts.mk | 2 +-
share/mk/src.opts.mk | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk
index 439924d0d596..2251b499ffdc 100644
--- a/share/mk/bsd.opts.mk
+++ b/share/mk/bsd.opts.mk
@@ -65,6 +65,7 @@ __DEFAULT_YES_OPTIONS = \
NLS \
OPENSSH \
RELRO \
+ REPRODUCIBLE_BUILD \
SSP \
TESTS \
TOOLCHAIN \
@@ -78,7 +79,6 @@ __DEFAULT_NO_OPTIONS = \
CCACHE_BUILD \
CTF \
INSTALL_AS_USER \
- REPRODUCIBLE_BUILD \
RETPOLINE \
RUN_TESTS \
STALE_STAGED \
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index fe71796d2270..fe4b027a9a1e 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -163,7 +163,6 @@ __DEFAULT_YES_OPTIONS = \
QUOTAS \
RADIUS_SUPPORT \
RBOOTD \
- REPRODUCIBLE_BUILD \
RESCUE \
ROUTED \
SENDMAIL \