src.sys.mk: Support src.conf in SRCTOP

If SRCCONF is not defined and src.conf exists at the top level of the
source tree, use that instead of /etc/src.conf.

MFC after:	3 days
Reviewed by:	kevans, imp
Differential Revision:	https://reviews.freebsd.org/D52470

(cherry picked from commit dd8c666d8b)

UPDATING: mention the src.conf change

Fixes:		dd8c666d8b ("src.sys.mk: Support src.conf in SRCTOP")
(cherry picked from commit ab2fea3f9a)
This commit is contained in:
Dag-Erling Smørgrav committed 2025-09-16 13:27:55 +00:00
1 parent 61735a4f68
commit a5bf37963a
6 files changed
+25 -5

No files matched your search

+1
View File
@@ -28,3 +28,4 @@ tags
.cache
.clangd
.ccls-cache
/src.conf
+5
View File
@@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before updating system packages
and/or ports.
20250916:
If SRCCONF is unset and a file named src.conf is present at
the top of the source tree, it will now be used instead of
/etc/src.conf.
20250823:
Commit 3f61ececacd8 changed the internal KAPI between
the NFS modules. As such, they all need to be rebuilt
+6 -3
View File
@@ -1,5 +1,5 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
.Dd June 13, 2025
.Dd September 16, 2025
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -29,8 +29,11 @@ variables that control the aspects of how the system builds.
.Pp
The default location of
.Nm
is
.Pa /etc/src.conf ,
is the top level of the source tree, or
.Pa /etc/src.conf
if no
.Nm
is found in the source tree itself,
though an alternative location can be specified in the
.Xr make 1
variable
+4
View File
@@ -6,7 +6,11 @@
.if !defined(_WITHOUT_SRCCONF)
# Allow user to configure things that only effect src tree builds.
.if exists(${SRCTOP}/src.conf)
SRCCONF?= ${SRCTOP}/src.conf
.else
SRCCONF?= /etc/src.conf
.endif
.if !empty(SRCCONF) && \
(exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && \
!target(_srcconf_included_)
+4
View File
@@ -8,7 +8,11 @@
# the rest of /usr/src, but they still always process SRCCONF even though
# the normal mechanisms to prevent that (compiling out of tree) won't
# work. To ensure they do work, we have to duplicate thee few lines here.
.if exists(${SRCTOP}/src.conf)
SRCCONF?= ${SRCTOP}/src.conf
.else
SRCCONF?= /etc/src.conf
.endif
.if (exists(${SRCCONF}) || ${SRCCONF} != "/etc/src.conf") && !target(_srcconf_included_)
.include "${SRCCONF}"
_srcconf_included_:
+5 -2
View File
@@ -179,8 +179,11 @@ variables that control the aspects of how the system builds.
.Pp
The default location of
.Nm
is
.Pa /etc/src.conf ,
is the top level of the source tree, or
.Pa /etc/src.conf
if no
.Nm
is found in the source tree itself,
though an alternative location can be specified in the
.Xr make 1
variable