From nobody Wed Mar 19 21:23:39 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 4ZJ1sv4SNKz5qjSb; Wed, 19 Mar 2025 21:23:47 +0000 (UTC) (envelope-from chuq@chuq.com) Received: from mail.vc.panix.com (mail.vc.panix.com [166.84.1.92]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ1sv2Nz6z3Y0R; Wed, 19 Mar 2025 21:23:47 +0000 (UTC) (envelope-from chuq@chuq.com) Authentication-Results: mx1.freebsd.org; none Received: from vc.chuq.com (vc.chuq.com [166.84.7.169]) by mail.vc.panix.com (Postfix) with ESMTPS id 4ZJ1sm6rLRz4P0d; Wed, 19 Mar 2025 17:23:40 -0400 (EDT) Received: from spathi.chuq.com (spathi.chuq.com [24.6.146.244]) by vc169.vc.panix.com (Postfix) with ESMTPS id 810933B5D7F; Wed, 19 Mar 2025 14:23:40 -0700 (PDT) (envelope-from chuq@chuq.com) Received: by spathi.chuq.com (Postfix, from userid 1022) id AE4F83CFFA25; Wed, 19 Mar 2025 14:23:39 -0700 (PDT) Date: Wed, 19 Mar 2025 14:23:39 -0700 From: Chuck Silvers To: Brooks Davis Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 623be660fcc9 - main - beep: add missing include of src.opts.mk, use LIBADD instead of LDFLAGS Message-ID: References: <202503192022.52JKMaUG019132@gitrepo.freebsd.org> 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-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:2033, ipnet:166.84.0.0/16, country:US] X-Rspamd-Queue-Id: 4ZJ1sv2Nz6z3Y0R X-Spamd-Bar: ---- On Wed, Mar 19, 2025 at 08:44:13PM +0000, Brooks Davis wrote: > On Wed, Mar 19, 2025 at 08:22:36PM +0000, Chuck Silvers wrote: > > The branch main has been updated by chs: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 > > > > commit 623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 > > Author: Chuck Silvers > > AuthorDate: 2025-03-19 19:48:10 +0000 > > Commit: Chuck Silvers > > CommitDate: 2025-03-19 19:48:10 +0000 > > > > beep: add missing include of src.opts.mk, use LIBADD instead of LDFLAGS > > > > Sponsored by: Netflix > > --- > > usr.bin/beep/Makefile | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/usr.bin/beep/Makefile b/usr.bin/beep/Makefile > > index f252ab64f843..8388ff7ff986 100644 > > --- a/usr.bin/beep/Makefile > > +++ b/usr.bin/beep/Makefile > > @@ -1,6 +1,7 @@ > > +.include > > Why add src.opts.mk? Nothing is using it and bsd.prog.mk will include > it. Is there another change coming that will use it? > > -- Brooks > > > + > > PROG= beep > > MAN= beep.1 > > - > > -LDFLAGS= -lm > > +LIBADD= m > > > > .include > > the motivation for these changes is that I want to be able to add something to LDFLAGS in /etc/src.conf and have that actually affect every executable and shared library that is built. we don't actually care about beep or trim, I just noticed that they were not getting the LDFLAGS from src.conf and thought I would fix them for completeness. adding the include of src.opts.mk seemed to fix that. also, a great many makefiles include src.opts.mk as the first thing and I thought that was just some boilerplate that was expected to be done everywhere and had been overlooked in these two. at that point I had not changed the usage of LDFLAGS in these two makefiles. then as I was arranging this stuff to commit, I grep'ed for other makefiles that assign rather than append to LDFLAGS (like I had found in bsnmpd) and found that these same two makefiles also incorrectly assigned to LDFLAGS, so then I added the other changes you see in those two commits. I'm not sure why I thought that including src.opts.mk without changing the LDFLAGS usage made things work initially. I tried that again just now and indeed it doesn't help, and the parts that remove the assignment to LDFLAGS are enough. maybe I had something stale in my obj dir before? anyway, I'd be happy to remove the include of src.opts.mk from these again if you'd like. -Chuck