Date: Tue, 30 Sep 2025 08:22:46 +1000 From: Peter Jeremy <peterj@freebsd.org> To: Christos Margiolis <christos@freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 9cab9fde5eda - main - virtual_oss: Port to base Message-ID: <aNsGtpC_-XwVDGwS@server.rulingia.com> In-Reply-To: <DD5ITNGR3I88.10EV9T4PO8N2I@freebsd.org> References: <202509280958.58S9wrww083342@gitrepo.freebsd.org> <aNpYS5IcVr5ZKLU3@server.rulingia.com> <DD5ITNGR3I88.10EV9T4PO8N2I@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--e/Z7ct8axfxIUQau Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2025-Sep-29 21:11:53 +0200, Christos Margiolis <christos@freebsd.org> wr= ote: >On Mon Sep 29, 2025 at 11:58 AM CEST, Peter Jeremy wrote: >> On 2025-Sep-28 09:58:53 +0000, Christos Margiolis <christos@FreeBSD.org>= wrote: >>>The branch main has been updated by christos: >>> >>>URL: https://cgit.FreeBSD.org/src/commit/?id=3D9cab9fde5edad9b409dd2317a= 2aec7815e6d6bed >>> >>>commit 9cab9fde5edad9b409dd2317a2aec7815e6d6bed >>>Author: Christos Margiolis <christos@FreeBSD.org> >>>AuthorDate: 2025-09-28 09:56:52 +0000 >>>Commit: Christos Margiolis <christos@FreeBSD.org> >>>CommitDate: 2025-09-28 09:56:52 +0000 >>> >>> virtual_oss: Port to base >> >> This fails to compile if "WITHOUT_BLUETOOTH=3Dyes" is specified (see bel= ow) >> 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. =2E.. > >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/Makefile index bf73041377b3..0fc611832795 100644 --- a/usr.sbin/virtual_oss/Makefile +++ b/usr.sbin/virtual_oss/Makefile @@ -1,8 +1,9 @@ .include <src.opts.mk> =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 <bsd.subdir.mk> --=20 Peter Jeremy --e/Z7ct8axfxIUQau Content-Type: application/pgp-signature; name=signature.asc -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEE7rKYbDBnHnTmXCJ+FqWXoOSiCzQFAmjbBq5fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEVF QjI5ODZDMzA2NzFFNzRFNjVDMjI3RTE2QTU5N0EwRTRBMjBCMzQACgkQFqWXoOSi CzTR2Q//QdTQu9kSPOzQnkjwGsXawq4VG+ygz80WGLwkLa2rjUXFG/qYZjXEXy9V W+PE5Fp6xV93N7Kkxtfy5hn34N2NLLWFkZNonAGRySzKBRQ2jxivnClRm4VpsKLw sQhjL9cA8bVDBgxRoXwkloQKBDax0TdMMy3Qt1ZWGbJ5YcTwcJo6khK8X1q7dL6Y ZzGCKcLal+RYd6rjoKfih0ZaGnnLdvyX6IpwPEYSmDlAoWlo+CxnIF0+KWInYGEz Ip7Ij/UqX6UO9XDZ7adDxsG+qDeOAnjg867TbRvrUStD3EfrREAEtRjdtYHs529d ZCYQrkF40jaRUp63OgjadwGVVCgVBMzRGy99L/kXMqxQE9D2P5T7U8CLTQ89npyL 0rxb+eMPuhNuurXsXyE+Su9LFZd1OuMcRLBKBZ+nqHp66Mzgy4BKm3Pyl+BJXcLb 7vVF7d1H5hvpuHydGmNAkzOwL9ahcQnZm9NXD8VS7jq/G3/iRtrure20HB2OP1i2 MPNip7VwECjIgU8Ribp/BPcT4KKu4a8cqt8yCCGZwVNFWWjhd3N+ioT04W5Akyp8 e9f4AijDdmCSt8VJK7gADnL9wkgYWJSTzu3akEKAijXVnTYFBmI3+hKuI5zDpGu9 HJjP9s41KmVgWEY59uz9FxQvG7m9PsqRt0T0KP4xTwNK4xFoQBI= =P4z8 -----END PGP SIGNATURE----- --e/Z7ct8axfxIUQau--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?aNsGtpC_-XwVDGwS>