kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-11 19:57:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
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
This commit is contained in:
Dag-Erling Smørgrav 2025-09-10 18:57:26 +02:00
parent d549de7690
commit dd8c666d8b
5 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -29,3 +29,4 @@ tags
.clangd
.ccls-cache
sys/*/compile
/src.conf

9
share/man/man5/src.conf.5
View file

@ -1,5 +1,5 @@
.\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
.Dd August 20, 2025
.Dd September 10, 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
share/mk/src.sys.mk
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
sys/conf/kern.pre.mk
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_:

7
tools/build/options/makeman
View file

@ -222,8 +222,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