From nobody Sat Dec 30 17:11:21 2023 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 4T2TL12rNsz55dQH; Sat, 30 Dec 2023 17:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T2TL12Pgcz4GlD; Sat, 30 Dec 2023 17:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703956281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ylAjsbPyt/Q4VH6cT5fTS9ZDQ5x725EZGtWANcnBgcM=; b=Mkghfx/cuuo30jtCBFzLcgmKRNZZoTSVqs9Bs+qm5yWOYUrIKij3hoQ7/Sq5NlU3PYzQ62 BNMrd2XX5Q58VP4Bzwq+v2eJCiy0v3asX4CebW44jSeq1Wtzm23IaWKBUT+zlvUOrw0KVw wW6SUIGRjZFvKNla4hJrRRy3P2gWUvc2ILvgOuyeEACmLI3Am+L/glwM3L7YVHlNb/7WLL yiVBnuZ0pQ3xmicjTL8GU2h5MJukdlaH9D9d5WvrmKSJ6pHzC32NX2Q9F+U5okbjIBitXK /krljmLfBWc3Y8gz6/WLB1Nqrawca38Rk5LZWTapR885Y/WU16FG4agOP7U8HQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703956281; a=rsa-sha256; cv=none; b=OpiQ5qIZrGeejBtjwtE/HfDYn8WVuC2twicuAHuHAPUbJWQvXe4GGHNyRJGx5wm/t1K5ZV Z0Nb/35H6yg/6TyNze3FC1OSYRbkcA57oJUNBfbW8jcL2J28pWgexzu5L84bEuprTowulI e0O0XsxyKq3XBkb800eBESalMI7habYYU7wwOD5nNT0wxT9ZTePQ5+z1c0fTS8G8tYcZCa NCU58j2KAaRzZDKVDcLNIm3Qec1Ydr3/18KGjLG6sAnSLcxRsQBUyaaQju2Dn8jTHblbED y83Q9YKmLfTjH90wbF9JcL/3jyH6j0pLmU09k4zhuF6qKfegwoqyoVzSGKUrrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703956281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ylAjsbPyt/Q4VH6cT5fTS9ZDQ5x725EZGtWANcnBgcM=; b=G6QhhcNbr5lg7XnWFNh5GwpWx2Ia8XuOnnfY6nzHki6B0XRKJanBsLtryPcfZJ7s80NxEH blzM1v0nI7USmKsn/aotEBYNgbkDfr3DwupMjg3W3LpKhc/ijXoBiDfMaddOF6HfiV7+Um zOYU9uhAKr0CwYMyDaTtoIdfRclApSyHBDBOM/D5IprSGiA4DXzLnXSweG3FtkBTC2+/59 otLryAWHNNMo/EyGA/9MiAiT9QmtXVknCoks2e4vCEAmLH9Iju8fincLprddg4MOvkI2AO amFTBWfAe4AFVCCsuOLZDu0z2xxPTQMg0DUYdQJUFxJDZGM0W3IIwpY0Intgnw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T2TL11S23zykS; Sat, 30 Dec 2023 17:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BUHBLI1099762; Sat, 30 Dec 2023 17:11:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BUHBLgi099759; Sat, 30 Dec 2023 17:11:21 GMT (envelope-from git) Date: Sat, 30 Dec 2023 17:11:21 GMT Message-Id: <202312301711.3BUHBLgi099759@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 4d08b569a01e - main - bsd.man.mk allow staging compressed pages 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d08b569a01efec69319d9d22c7e361b8270a21d Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=4d08b569a01efec69319d9d22c7e361b8270a21d commit 4d08b569a01efec69319d9d22c7e361b8270a21d Author: Simon J. Gerraty AuthorDate: 2023-12-30 17:10:03 +0000 Commit: Simon J. Gerraty CommitDate: 2023-12-30 17:10:03 +0000 bsd.man.mk allow staging compressed pages In the DIRDEPS_BUILD we use staging. The staging logic in bsd.man.mk was in the wrong place, shift it and add compressed man pages to the stage set if appropriate. Reviewed by: stevek Differential Revision: https://reviews.freebsd.org/D43238 --- share/mk/bsd.man.mk | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index 25a0edcc7bc5..c80c618e48db 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -130,22 +130,6 @@ all-man: ${MAN} ZEXT= ${MCOMPRESS_EXT} .if defined(MAN) && !empty(MAN) -.if ${MK_STAGING_MAN} == "yes" -STAGE_TARGETS+= stage_files -_mansets:= ${MAN:E:O:u:M*[1-9]:@s@man$s@} -STAGE_SETS+= ${_mansets} -.for _page in ${MAN} -stage_files.man${_page:T:E}: ${_page} -STAGE_DIR.man${_page:T:E}?= ${STAGE_OBJTOP}${MANDIR}${_page:T:E}${MANSUBDIR} -.endfor -.if !empty(MLINKS) -STAGE_SETS+= mlinks -STAGE_TARGETS+= stage_links -STAGE_LINKS.mlinks:= ${MLINKS:M*.[1-9]:@f@${f:S,^,${MANDIR}${f:E}${MANSUBDIR}/,}@} -stage_links.mlinks: ${_mansets:@s@stage_files.$s@} -.endif -.endif - CLEANFILES+= ${MAN:T:S/$/${MCOMPRESS_EXT}/g} CLEANFILES+= ${MAN:T:S/$/${CATEXT}${MCOMPRESS_EXT}/g} .for __page in ${MAN} @@ -185,6 +169,27 @@ _MANLINKS+= ${CATDIR}${_osect}${MANSUBDIR}/${_oname} \ .endfor .endif +.if defined(MAN) && !empty(MAN) +.if ${MK_STAGING_MAN} == "yes" +STAGE_TARGETS+= stage_files +_mansets:= ${MAN:E:O:u:M*[1-9]:@s@man$s@} +STAGE_SETS+= ${_mansets} +.for _page in ${MAN} +stage_files.man${_page:T:E}: ${_page} +.if target(${_page}${MCOMPRESS_EXT}) +stage_files.man${_page:T:E}: ${_page}${MCOMPRESS_EXT} +.endif +STAGE_DIR.man${_page:T:E}?= ${STAGE_OBJTOP}${MANDIR}${_page:T:E}${MANSUBDIR} +.endfor +.if !defined(NO_MLINKS) && !empty(MLINKS) +STAGE_SETS+= mlinks +STAGE_TARGETS+= stage_links +STAGE_LINKS.mlinks:= ${MLINKS:M*.[1-9]:@f@${f:S,^,${MANDIR}${f:E}${MANSUBDIR}/,}@} +stage_links.mlinks: ${_mansets:@s@stage_files.$s@} +.endif +.endif +.endif + maninstall: .if defined(MAN) && !empty(MAN) maninstall: ${MAN}