From owner-dev-commits-src-all@freebsd.org Tue Jul 6 21:42:53 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 578D7648CEF; Tue, 6 Jul 2021 21:42:53 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) (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 "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GKGHx1pctz3JK0; Tue, 6 Jul 2021 21:42:53 +0000 (UTC) (envelope-from fernando.apesteguia@gmail.com) Received: by mail-oi1-f179.google.com with SMTP id h9so975375oih.4; Tue, 06 Jul 2021 14:42:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=Sn9hrf7Xd1oxpLCYfT20DzRJi1jK+ITgAaBlaIrsdbE=; b=kkQlSp7L5+3o3S4KgGZA6t3ojTER9085H6MQs4sC2dpIO3TJI6jfZNI1oPoCJfjsCK 51Bg6D4v4LNtaO64bNBC4EKaQGT6gW4IvmdmF4t8krUBklamz6JkH3c0NvLptG49gEzc eOR1RvP0qGuju1QGFXutB/oGDI/Lz+7PAqBC2dG404rPuE5v+KNjhDA9Ier6F6knm0mO 4Mrc3MStSG3d77aLLESJfM61ZFrjh/nDlYQnaYodmpOVyQqZHR3R/YxfteQLDLeU5+Er DtGdpmMBVDPXmv9xM+Jiigw6+BGQtgJl0/xWazOYHOmPOQJUCditqLAon4VSvbd1Wx+J wsYA== X-Gm-Message-State: AOAM5307XdJGRDqx1YJcrjKIHsrrQKHBwH1xeYQxpvispQ74VA62IP0A VXh9Yhi5opIzXOb7fdMirERSLq/csAX3wQ== X-Google-Smtp-Source: ABdhPJzL3xYPqv0it/9+8OHFAg5n+nYNuZGjYRoKe/5/QKnkpahwDHPapn7T9TQd+wMyzv9bGz+ANw== X-Received: by 2002:aca:dc44:: with SMTP id t65mr16148666oig.76.1625607771526; Tue, 06 Jul 2021 14:42:51 -0700 (PDT) Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com. [209.85.210.53]) by smtp.gmail.com with ESMTPSA id o26sm3664302oic.12.2021.07.06.14.42.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Jul 2021 14:42:51 -0700 (PDT) Received: by mail-ot1-f53.google.com with SMTP id d27-20020a05683018fbb02904ae64d1b56bso221628otf.9; Tue, 06 Jul 2021 14:42:51 -0700 (PDT) X-Received: by 2002:a25:bb08:: with SMTP id z8mr28378392ybg.188.1625607411652; Tue, 06 Jul 2021 14:36:51 -0700 (PDT) MIME-Version: 1.0 References: <202106300806.15U86pGq037942@gitrepo.freebsd.org> <20210706090311.aomxh4n45tkpktdc@aniel.nours.eu> In-Reply-To: <20210706090311.aomxh4n45tkpktdc@aniel.nours.eu> From: =?UTF-8?Q?Fernando_Apestegu=C3=ADa?= Date: Tue, 6 Jul 2021 21:34:40 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 0a0f7486413c - main - man: Build manpages for all architectures To: Baptiste Daroussin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4GKGHx1pctz3JK0 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jul 2021 21:42:53 -0000 On Tue, Jul 6, 2021 at 11:03 AM Baptiste Daroussin wrote= : > > On Wed, Jun 30, 2021 at 08:06:51AM +0000, Fernando Apestegu=C3=ADa wrote: > > The branch main has been updated by fernape (doc, ports committer): > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D0a0f7486413c147d56808b38= 055c40c64cff61f5 > > > > commit 0a0f7486413c147d56808b38055c40c64cff61f5 > > Author: Fernando Apestegu=C3=ADa > > AuthorDate: 2021-06-09 10:58:04 +0000 > > Commit: Fernando Apestegu=C3=ADa > > CommitDate: 2021-06-30 07:57:51 +0000 > > > > man: Build manpages for all architectures > > > > Building and installing architecture-specific man pages only raises= a number of > > problems: > > > > * The https://www.freebsd.org/cgi/man.cgi is incomplete. As an > > example, it does not show results for pae(4). The reason for thi= s is > > that the cgi interface runs on FreeBSD amd64. > > > > * In FreeBSD amd64 some manual pages have broken X-refs. See hptrr= (4) > > for an example. > > > > * Also, we have broken links in our Release Notes. This is a > > consequence of the first point. See > > https://www.freebsd.org/releases/13.0R/hardware/#proc-i386. > > > > Make MAN_ARCH default to 'all' so we build all the man pages for al= l the > > architectures. The difference in disk space is negligible. Also lin= k > > architecture-specific man pages to their own section while keeping = their own > > namespace. > > > > PR: 212290 > > Reported by: mj@bsdops.com > > Approved by: ceri@, wosch@ > > MFC after: 4 weeks > > --- > > sbin/Makefile | 6 ++++++ > > share/man/man4/Makefile | 4 +--- > > share/man/man4/man4.aarch64/Makefile | 5 +++++ > > share/man/man4/man4.arm/Makefile | 5 +++++ > > share/man/man4/man4.i386/Makefile | 5 +++++ > > share/man/man4/man4.powerpc/Makefile | 5 +++++ > > share/man/man5/make.conf.5 | 2 +- > > usr.sbin/Makefile | 7 +++++++ > > usr.sbin/apm/Makefile | 4 ++++ > > 9 files changed, 39 insertions(+), 4 deletions(-) > > > > diff --git a/sbin/Makefile b/sbin/Makefile > > index 64840bae82bb..f53e2f037ebe 100644 > > --- a/sbin/Makefile > > +++ b/sbin/Makefile > > @@ -90,6 +90,12 @@ SUBDIR.${MK_ZFS}+=3D zfsbootcfg > > > > SUBDIR.${MK_TESTS}+=3D tests > > > > +# Add architecture-specific manpages > > +# to be included anyway > > +MAN=3D sconfig/sconfig.8 > > + > > +.include > > + > > .include > > > > SUBDIR_PARALLEL=3D > > diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile > > index 5051470edc71..9027fe7df841 100644 > > --- a/share/man/man4/Makefile > > +++ b/share/man/man4/Makefile > > @@ -895,9 +895,7 @@ _cgem.4=3D cgem.4 > > MLINKS+=3Dcgem.4 if_cgem.4 > > .endif > > > > -.if empty(MAN_ARCH) > > -__arches=3D ${MACHINE} ${MACHINE_ARCH} ${MACHINE_CPUARCH} > > -.elif ${MAN_ARCH} =3D=3D "all" > > +.if empty(MAN_ARCH) || ${MAN_ARCH} =3D=3D "all" > > __arches=3D ${:!/bin/sh -c "/bin/ls -d ${.CURDIR}/man4.*"!:E} > > .else > > __arches=3D ${MAN_ARCH} > > diff --git a/share/man/man4/man4.aarch64/Makefile b/share/man/man4/man4= .aarch64/Makefile > > index 6714a47011ef..ef5fcd84ccd4 100644 > > --- a/share/man/man4/man4.aarch64/Makefile > > +++ b/share/man/man4/man4.aarch64/Makefile > > @@ -17,6 +17,11 @@ MAN=3D \ > > rk_i2c.4 \ > > rk_pinctrl.4 \ > > > > +# Link files to the parent directory > > +.for _manpage in ${MAN} > > +MLINKS+=3D${_manpage} ../${_manpage} > > +.endfor > > This breaks make -DNO_ROOT in a subtle manner and so likely pkgbase. > > The right way to do it is to add something that uses INSTALL_RSYMLINK or = alike. I'll look into it. Thanks! > > Best regards, > Bapt