From nobody Thu Aug 28 14:09:47 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 4cCNZN4tqQz664b9; Thu, 28 Aug 2025 14:09:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cCNZN3w1jz3x8b; Thu, 28 Aug 2025 14:09:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756390188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WnN2SsEWyaE3OWLpdOrl9EKSbWAsJX1/se2MTyofGUg=; b=F++64R5LcyTogj5SdGkytukD6oAlf2nunZ2r65iRVqyaQ2QrKc2sr7QCQ+UF2/Gvko89sP 7Shujl9Z/UC0bhHvhcSne/qRSYw8m2UBdkVW9L56JGk9XFTYxwCzzo29y8/kHbqgsjm/Z+ 5kalQcMC8Q16sBs5pLYlEFsDR3KFjOwni1HV24MtbZpn2RnKd/7/i3YIf88dsrAFJ+HKEB QKd1YttOWBcbcNfqR6173D/LX7FQAgWflWVGcNZPXAtshfkSeRIBVNrRuU9UtCnSqVmY8+ QFTdZTjYlaX8KKEuJyxUvwHDnOhqxOoA9QLBCoTYYWAHgdemCOqZuTFtDVk3Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756390188; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WnN2SsEWyaE3OWLpdOrl9EKSbWAsJX1/se2MTyofGUg=; b=wbnyZeFobQaoYFSfJ5rWDZQd7B01wyJegI4vs/x0jXIZO1HN0dDGsAVauPfC4y2ecQ0Bh7 40CjUHMAVltTAtSkd+GA+QmtvukBxFiJ9bIsv82B7fxveuWAsEKkKH/YIgH1ihw9C/VOeq IiFePTWABG8B6emJRGD2OzCO2E78jtTJaXJFJKxqy0dkl9Y2WiyvBgAgKR5UxEDBSyDsTY C0ZeVfrp1fg2y2vBq/R3y4E/BkzDNfN3B8GyW5ESwVAyeVV4helf9JFYV9F6qstClJT15E rUiQ4XxhSuToPatnTSCg/HPFJ7/vwpUdd16poESJFw1F0POayUt5LHLvlcJ3EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756390188; a=rsa-sha256; cv=none; b=ZS+otAmyo8iamxR4QmhZFL8ZnIFhN9LSB2PFQqkcMljPOLMzyEurrx4yTP/euiWA1+v6ke DC89Ch1tlfy3untaDSAcuIISEBxDKN3ELju1pzYMMrHWHwRUCbwJEgAB9G0mIWqC3+YZDu ccxmdwK5JbOsy4wariloAqwbzBB7/ipjemMxAX2AsKX0dvTxYaWRYFfm4VPkaX/32wKkeg UEzL2evgnWF+5CSopTbgCZqd1tbscbehh0RWFYQdyEF1A3PinBgcMRPcyD9YLH/Kkerq1p 2BxxX0leTP2XHJC9laSDULlNQQtzeqlxxDMUTNEHbe0Q1j229WJsNg86jrVEiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:5c0:4202:5670:4881:bfa2:e7ac:d89c] (unknown [IPv6:2601:5c0:4202:5670:4881:bfa2:e7ac:d89c]) (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 did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4cCNZN1n2CztNc; Thu, 28 Aug 2025 14:09:48 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Thu, 28 Aug 2025 10:09:47 -0400 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 User-Agent: Mozilla Thunderbird Subject: Re: git: 557cc0f350e7 - main - bsd.man.mk: Handle MANSRC.{TARGET} for MK_MANCOMPRESS=no and empty MANBUILDCAT Content-Language: en-US To: Matteo Riondato Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202508272012.57RKC8kl035894@gitrepo.freebsd.org> <2CBEC227-279A-4263-9B77-CAB3C5CB9E69@FreeBSD.org> From: John Baldwin In-Reply-To: <2CBEC227-279A-4263-9B77-CAB3C5CB9E69@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 8/28/25 08:10, Matteo Riondato wrote: > > >> On Aug 27, 2025, at 4:12 PM, John Baldwin wrote: >> >> The branch main has been updated by jhb: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=557cc0f350e758a223dffe8bca359de9fc2642b2 >> >> commit 557cc0f350e758a223dffe8bca359de9fc2642b2 >> Author: John Baldwin >> AuthorDate: 2025-08-27 20:11:54 +0000 >> Commit: John Baldwin >> CommitDate: 2025-08-27 20:11:54 +0000 >> >> bsd.man.mk: Handle MANSRC.{TARGET} for MK_MANCOMPRESS=no and empty MANBUILDCAT >> >> 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 “WITHOUT_MANCOMPRESS=y” from src.conf to make buildworld complete. 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. > Once I’ve done a successful buildworld with “WITHOUT_MANCOMPRESS=y” disabled, I tried to buildworld with “WITHOUT_MANCOMPRESS=y” enabled, and it failed again, at: > > make[3]: don't know how to make apmd.8. Stop > > (detailed message below) > > I have “WITHOUT_APM=y” in src.conf, so I don’t know why it is trying to build ampd.8. 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): # Add architecture-specific manpages # to be included anyway MAN= apmd/apmd.8 \ nvram/nvram.8 > I tried without specifying “-j50”, with “WITHOUT_MANCOMPRESS=y” enabled, and it stopped at: > > make[4]: don't know how to make vi.1. Stop This is similar to the above in that it has a relative pathname with a subdirectory: MAN= ${SRCDIR}/man/vi.1 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. The patch below fixes a manual 'make WITHOUT_MANCOMPRESS=yes' in usr.bin/vi in a buildenv for me and I think would fix the apmd.8 case as well. 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+= ${__target} ${__target}: ${MANSRC.${__page:T}} ${CP} ${.ALLSRC} ${.TARGET} -.endif .endfor +.else +all-man: ${__page} +.endif .endfor .endif .endif (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?) -- John Baldwin