From nobody Tue Sep 30 09:14:07 2025 X-Original-To: dev-commits-src-main@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 4cbXS44Syqz68m0s; Tue, 30 Sep 2025 09:14:12 +0000 (UTC) (envelope-from christos@freebsd.org) Received: from margiolis.net (mail.margiolis.net [95.179.159.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4cbXS36hJZz4QY3; Tue, 30 Sep 2025 09:14:11 +0000 (UTC) (envelope-from christos@freebsd.org) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=default; bh=jPAZ4mdJ+9kX ykIifQzY+OX1Ob8JE2diHLGGM+w+XI0=; h=in-reply-to:references:to:from: subject:cc:date; d=margiolis.net; b=SNigtDPORYVcZkRPVFcCXebHuGyO1nFD2T 4CWckbNaCxYf1CB7v8gFPcijBnk54F34aKQU/GivG/Yg2NIlCmgnTJNGN475PNU9Dzxgru tXNeubDE0GmZjmSJoOxVT7TfpFBfTTTnUnDuzKM14086f/nJJUTjGA6DBY1xxnNglu4= Received: from localhost (public-gprs552949.centertel.pl [37.225.23.54]) by margiolis.net (OpenSMTPD) with ESMTPSA id 7e2e707e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 30 Sep 2025 03:14:09 -0600 (MDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Tue, 30 Sep 2025 11:14:07 +0200 Message-Id: Cc: , , Subject: Re: git: 9cab9fde5eda - main - virtual_oss: Port to base From: "Christos Margiolis" To: "Peter Jeremy" X-Mailer: aerc 0.21.0 References: <202509280958.58S9wrww083342@gitrepo.freebsd.org> In-Reply-To: X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cbXS36hJZz4QY3 On Tue Sep 30, 2025 at 12:22 AM CEST, Peter Jeremy wrote: > On 2025-Sep-29 21:11:53 +0200, Christos Margiolis = wrote: >>On Mon Sep 29, 2025 at 11:58 AM CEST, Peter Jeremy wrote: >>> On 2025-Sep-28 09:58:53 +0000, Christos Margiolis wrote: >>>>The branch main has been updated by christos: >>>> >>>>URL: https://cgit.FreeBSD.org/src/commit/?id=3D9cab9fde5edad9b409dd2317= a2aec7815e6d6bed >>>> >>>>commit 9cab9fde5edad9b409dd2317a2aec7815e6d6bed >>>>Author: Christos Margiolis >>>>AuthorDate: 2025-09-28 09:56:52 +0000 >>>>Commit: Christos Margiolis >>>>CommitDate: 2025-09-28 09:56:52 +0000 >>>> >>>> virtual_oss: Port to base >>> >>> This fails to compile if "WITHOUT_BLUETOOTH=3Dyes" is specified (see be= low) >>> because bluetooth.h isn't available (as expected). It looks like >>> virtual_oss isn't taking that option into account when working out what >>> to compile. > ... >> >>I haven't had time to test yet, but I will try tomorrow. Does the build >>work if you build virtual_bt_speaker(8) conditionally in the Makefile >>(i.e., usr.sbin/virtual_oss/Makefile)? > > The following patch builds as expected both with and without > WITHOUT_BLUETOOTH=3Dyes > > diff --git a/usr.sbin/virtual_oss/Makefile b/usr.sbin/virtual_oss/Makefil= e > index bf73041377b3..0fc611832795 100644 > --- a/usr.sbin/virtual_oss/Makefile > +++ b/usr.sbin/virtual_oss/Makefile > @@ -1,8 +1,9 @@ > .include > =20 > -SUBDIR+=3D virtual_bt_speaker \ > - virtual_oss_cmd \ > +SUBDIR+=3D virtual_oss_cmd \ > virtual_oss > =20 > +SUBDIR.${MK_BLUETOOTH}+=3D virtual_bt_speaker=20 > + > .include "Makefile.inc" > .include Fixed: https://cgit.freebsd.org/src/commit/?id=3D25d551b5fb1d28ed485d56d9d637993eb= 2d223b1 Thanks for reporting. Christos