Re: git: f74f891581bc - main - src.opts: Introduce MK_SOUND

From: Brooks Davis <brooks_at_freebsd.org>
Date: Wed, 14 Jan 2026 11:17:40 UTC
On Mon, Jan 12, 2026 at 02:16:43PM +0000, Christos Margiolis wrote:
> The branch main has been updated by christos:
> 
> URL: https://cgit.FreeBSD.org/src/commit/?id=f74f891581bc4df20431607de9b761107f6a0aa7
> 
> commit f74f891581bc4df20431607de9b761107f6a0aa7
> Author:     Christos Margiolis <christos@FreeBSD.org>
> AuthorDate: 2026-01-12 14:16:35 +0000
> Commit:     Christos Margiolis <christos@FreeBSD.org>
> CommitDate: 2026-01-12 14:16:35 +0000
> 
>     src.opts: Introduce MK_SOUND
>     
>     PR:             291853
>     Sponsored by:   The FreeBSD Foundation
>     MFC after:      1 week
>     Reviewed by:    zarychtam_plan-b.pwste.edu.pl, markj
>     Differential Revision:  https://reviews.freebsd.org/D54456
> ---
>  lib/Makefile                             |  3 ++-
>  libexec/rc/rc.d/Makefile                 |  7 ++++---
>  sbin/devd/Makefile                       | 12 +++++++-----
>  share/mk/src.opts.mk                     |  6 ++++++
>  tools/build/mk/OptionalObsoleteFiles.inc | 13 +++++++++++++
>  tools/build/options/WITH_SOUND           |  1 +
>  usr.bin/Makefile                         |  2 ++
>  usr.sbin/Makefile                        |  4 +++-
>  8 files changed, 38 insertions(+), 10 deletions(-)
> 
> diff --git a/lib/Makefile b/lib/Makefile
> index 216ba1d58473..d06488a33fb9 100644
> --- a/lib/Makefile
> +++ b/lib/Makefile
> @@ -176,7 +176,6 @@ SUBDIR+=	clang
>  .endif
>  
>  SUBDIR.${MK_CUSE}+= 	libcuse
> -SUBDIR.${MK_CUSE}+=	virtual_oss
>  SUBDIR.${MK_TOOLCHAIN}+=libpe
>  SUBDIR.${MK_DIALOG}+=	libdpv libfigpar
>  SUBDIR.${MK_FDT}+=	libfdt
> @@ -238,6 +237,8 @@ SUBDIR.${MK_PMC}+=	libpmc libpmcstat
>  SUBDIR.${MK_RADIUS_SUPPORT}+=	libradius
>  SUBDIR.${MK_SENDMAIL}+=	libmilter libsm libsmdb libsmutil
>  SUBDIR.${MK_TELNET}+=	libtelnet
> +SUBDIR.${MK_SOUND}+=	libmixer
> +SUBDIR.${MK_SOUND}+=	virtual_oss

This should be SUBDIR.${MK_CUSE}.${MK_SOUND} or MK_CUSE=no +
MK_SOUND=yes will be broken.  There's another case in use.sbin/Makefile.

-- Brooks