From nobody Thu Aug 28 15:53:44 2025 X-Original-To: dev-commits-src-all@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 4cCQtb6SZ5z66Dm6; Thu, 28 Aug 2025 15:53:59 +0000 (UTC) (envelope-from rionda@gmail.com) Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCQtb4cVVz3DbB; Thu, 28 Aug 2025 15:53:59 +0000 (UTC) (envelope-from rionda@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-7e864c4615aso236273485a.1; Thu, 28 Aug 2025 08:53:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756396437; x=1757001237; darn=freebsd.org; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:sender:from:to:cc:subject :date:message-id:reply-to; bh=XM1yBIYODFRcdwoPnctLZFFfIPlVpIF+QFACtyFqPCk=; b=m8zVbDzGc0YE03jrZJaQhMCW3Zx1WttlPkI9E6TIPma82jKem3vGmrtcqsmfCNLLgh 8ne/nev1o9p79Wz84CDrHTyrKASPugR4Flj7s8XSQHGQzM3Yd65QQ4RPwE7s2C+Kiyzn zb0eX9vfM0+Zv7HcQaMosrFYTu3Tqqj1ohb5DYXY4x3k9mGucOIONhkZfLFeN8REtDE/ mbTn/H28k+Hjv9hmHNXPnba9N0wu+01nrC+7E5ybamX00J6WgRvQJbO+HbHUekyzDovC 1TsbvG/+GRhqb3R6HSV+mAWrbTX+48zwWVpryVryA97xRVNl/EZUOhXdq2kV+JIx2JjP Yu9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756396437; x=1757001237; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:sender:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=XM1yBIYODFRcdwoPnctLZFFfIPlVpIF+QFACtyFqPCk=; b=xOYz8b6fu7Uk5hSKlEtXvk1toepQW05u9aB3SLAwqck76wpWeEsez+kk0jcTZ4MBIA JqZkiJuKL8uoMDBp8zV0wJt720irEc6049tN4pyMebvSLE7qhtKYvqTkJGhmtirATYdW /pdfJFpZ8PBBaUrdqtvavGLZl/K8o5DgfxOG7BTVZawTBD68BKNr9+98l8wYvz2M4r2A MhMw69pjMREWg7iiuLi36mNl48HZ8QTzOosQ2+yT8w8gqKmEc0nQ8yNax7oUueMO6SGq 2lngzfWbsonPEy1VOxakOuI+oZeAAeR/2Rx9//UKdHDQ7QKzfQZG14H2hSF916urMx89 Zu0Q== X-Forwarded-Encrypted: i=1; AJvYcCUmusfI6SIy/VVN2he9pcJKjRhm0Z1lJleIVw3BAr8AOpw2xjsRfBcUYOCl/Q0Nr4eE3DpVSdcT2NdJZkUf/N/SIRFzbGA=@freebsd.org, AJvYcCWgsG5Y13Xw/ouFbU0uiy5ORA2dBeaprk+4RW2k1QeddVuJnxHncNf7vROvSZKhzjIyyNi09GbnmVeXxPO9Iv7uTvnh@freebsd.org X-Gm-Message-State: AOJu0YzgUaZztK9xjrTu/Rpel4HMWyaUlRIFOF4rq42NVxGbL08lN02K 4GOb3bf1bOJDzd+yOrPAziuAKVzjSFGiyr9W5ERpQSP7s9iLHv1WHUZQM41iF2Rx X-Gm-Gg: ASbGncuMJU0Q2INaGqCQItMoNZPMc8RgEyFzXEFAQyjjdyn9FdjQc1SIYl1JoWYt3+d MPL42MxlBRBrwjY1jOu8tOAsHhbo971cGtwnWFbPh+bKpqbNuGqa7QFSlsHPSEkqFiKeWfAeJM8 sg3axm5QEfftswBj3KGGpj/pgTYBLozaBbPZp9wHXHXDCZFqCet4MRuhpKlS/AgPOKQM4dayukF AHkwe3+Jn9CpLH+5T1zm4BuRN9fa8RJ2H0qu4GN3o0T/I5ALPIHOJiTsmW+ldAhcLKYiBkUdxM8 eQQFi0idC2srV3Uadu/pQnTu2I4U8/f4bvrwBlnADm0zLK5T87LOwZhAOmIel1x7bpeDTraz1MN RnIsqN+XqAqNGDuOqnwdQ9SuSJ0SQP7jUurCyf1jTd2d2SLhG5n1u8vV6IxFLJz8= X-Google-Smtp-Source: AGHT+IFzqdaGGlSe1qe9SQAgyJMF2fM3D5ccfeR/uHWeQCs6aChqgOKc4dceoncbjLnSbBJ2aZWDag== X-Received: by 2002:a05:620a:a490:b0:7f7:4f00:aff with SMTP id af79cd13be357-7f74f000ed4mr823074685a.30.1756396437166; Thu, 28 Aug 2025 08:53:57 -0700 (PDT) Received: from smtpclient.apple ([2607:fb91:d0a:3a6:6997:95a0:9230:f52d]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7fc148493d1sm2512385a.33.2025.08.28.08.53.55 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Aug 2025 08:53:56 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6.1.21\)) Subject: Re: git: 557cc0f350e7 - main - bsd.man.mk: Handle MANSRC.{TARGET} for MK_MANCOMPRESS=no and empty MANBUILDCAT From: Matteo Riondato In-Reply-To: Date: Thu, 28 Aug 2025 11:53:44 -0400 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <743325E3-DDE0-464A-99E9-3FF0DDC28589@FreeBSD.org> References: <202508272012.57RKC8kl035894@gitrepo.freebsd.org> <2CBEC227-279A-4263-9B77-CAB3C5CB9E69@FreeBSD.org> To: John Baldwin X-Mailer: Apple Mail (2.3731.700.6.1.21) X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Rspamd-Queue-Id: 4cCQtb4cVVz3DbB > On Aug 28, 2025, at 10:09 AM, John Baldwin wrote: >=20 > On 8/28/25 08:10, Matteo Riondato wrote: >>> On Aug 27, 2025, at 4:12 PM, John Baldwin wrote: >>>=20 >>> The branch main has been updated by jhb: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D557cc0f350e758a223dffe8bca359de9= fc2642b2 >>>=20 >>> commit 557cc0f350e758a223dffe8bca359de9fc2642b2 >>> Author: John Baldwin >>> AuthorDate: 2025-08-27 20:11:54 +0000 >>> Commit: John Baldwin >>> CommitDate: 2025-08-27 20:11:54 +0000 >>>=20 >>> bsd.man.mk: Handle MANSRC.{TARGET} for MK_MANCOMPRESS=3Dno and = empty MANBUILDCAT >>>=20 >>> Reviewed by: kevans >>> Fixes: 65f60d715fd9 ("bsd.man.mk: Add a MANSRC.{TARGET} = variable") >>> Sponsored by: Chelsio Communications >>> Differential Revision: https://reviews.freebsd.org/D52181 >>> --- >> This did not fix the breakage of buildworld I reported. I had to = disable =E2=80=9CWITHOUT_MANCOMPRESS=3Dy=E2=80=9D from src.conf to make = buildworld complete. >=20 > Locally for me it fixed libutil++ (which is what you reported), and = while I also > tried a library that did not use MANSRC (libutil), something else must = be going > on. >=20 >> Once I=E2=80=99ve done a successful buildworld with = =E2=80=9CWITHOUT_MANCOMPRESS=3Dy=E2=80=9D disabled, I tried to = buildworld with =E2=80=9CWITHOUT_MANCOMPRESS=3Dy=E2=80=9D enabled, and = it failed again, at: >> make[3]: don't know how to make apmd.8. Stop >> (detailed message below) >> I have =E2=80=9CWITHOUT_APM=3Dy=E2=80=9D in src.conf, so I don=E2=80=99= t know why it is trying to build ampd.8. >=20 > Hmm, that is because of this in usr.sbin/Makefile which I think is = quite wrong > (it probably installs the manpage twice on i386 (and possibly in = different packages?) > which would break pkgbase if we were building packages for i386): >=20 > # Add architecture-specific manpages > # to be included anyway > MAN=3D apmd/apmd.8 \ > nvram/nvram.8 >=20 >> I tried without specifying =E2=80=9C-j50=E2=80=9D, with = =E2=80=9CWITHOUT_MANCOMPRESS=3Dy=E2=80=9D enabled, and it stopped at: >> make[4]: don't know how to make vi.1. Stop >=20 > This is similar to the above in that it has a relative pathname with a = subdirectory: >=20 > MAN=3D ${SRCDIR}/man/vi.1 >=20 > Most of the existing logic in bsd.man.mk uses :T, but perhaps the rule = this commit added > needs to not use :T when defining the target in the !MANSRC case. >=20 > The patch below fixes a manual 'make WITHOUT_MANCOMPRESS=3Dyes' in = usr.bin/vi in a buildenv > for me and I think would fix the apmd.8 case as well. >=20 > diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk > index 768879b64e60..a2c34eff9e3e 100644 > --- a/share/mk/bsd.man.mk > +++ b/share/mk/bsd.man.mk > @@ -169,14 +169,16 @@ ${__target}: ${MANSRC.${__page:T}:U${__page}} > .endfor > .else > .for __page in ${${__group}} > +.if defined(MANSRC.${__page:T}) > .for __target in ${__page:T:S/:/\:/g} > all-man: ${__target} > -.if defined(MANSRC.${__page:T}) > CLEANFILES+=3D ${__target} > ${__target}: ${MANSRC.${__page:T}} > ${CP} ${.ALLSRC} ${.TARGET} > -.endif > .endfor > +.else > +all-man: ${__page} > +.endif > .endfor > .endif > .endif This fixes =E2=80=9Cmake -j50 buildworld=E2=80=9D for me with = =E2=80=9CWITHOUT_MANCOMPRESS=3Dy=E2=80=9D in src.conf.=20 Thank you! > (In a related note, I don't really understand the nested for loops = used in much of bsd.man.mk, > once you do 'for page in group' page will already be a single word so = the 'for target in page' > will always just be a single iteration IIUC. Is it just a convenient = way to define __target as > a temporary variable?) That=E2=80=99s above my pay grade =3D) Thanks, Matteo