Date: Sun, 13 Apr 2014 17:23:16 -0600 From: Warner Losh <imp@bsdimp.com> To: Mark Johnston <markj@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers <src-committers@freebsd.org>, Warner Losh <imp@freebsd.org> Subject: Re: svn commit: r264402 - in head/share: examples/etc man/man5 mk Message-ID: <E2A7A22E-91AE-4034-A40C-C617CD564B5D@bsdimp.com> In-Reply-To: <CAMw1wOwbQhpUuY4L6u7ET2EqEv0_-8tUD9sFmN4WdNdJpRFg=w@mail.gmail.com> References: <201404130522.s3D5MRXc053006@svn.freebsd.org> <CAMw1wOyhL12L9uNVwNxT445851sPURMQNazHCqBER20-PGjMdw@mail.gmail.com> <9FB7142E-A0A0-41AF-BEFC-9306AE701B3F@bsdimp.com> <CAMw1wOwbQhpUuY4L6u7ET2EqEv0_-8tUD9sFmN4WdNdJpRFg=w@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
Thanks Mark. I’ve recreated both the problem, and the solution. I’ve reverted the offending change until I have time to make sure my fix actually works in a variety of situations. The tree should be good to go now. Warner On Apr 13, 2014, at 5:10 PM, Mark Johnston <markj@freebsd.org> wrote: > On Sun, Apr 13, 2014 at 4:57 PM, Warner Losh <imp@bsdimp.com> wrote: >> >> Are you sure it is this exact commit? > > It seems to be. I tried a > > # make SRCCONF=/dev/null MAKECONF=/dev/null buildworld installworld > > with and without this commit reverted, and installworld completed > successfully when the change was reverted. > >> >> Do you have anything in your /etc/make.conf or /etc/src.conf file? > > Yes, but clearing them doesn't fix the problem. > >> >> Can you send me your full install world output? > > Attached. > >> >> I’ll see if I can reproduce it myself. >> >> Warner >> >> On Apr 13, 2014, at 1:32 PM, Mark Johnston <markj@freebsd.org> wrote: >> >>> On Sun, Apr 13, 2014 at 1:22 AM, Warner Losh <imp@freebsd.org> wrote: >>>> Author: imp >>>> Date: Sun Apr 13 05:22:26 2014 >>>> New Revision: 264402 >>>> URL: http://svnweb.freebsd.org/changeset/base/264402 >>>> >>>> Log: >>>> Convert NO_MANCOMPRESS to normal convention. >>> >>> This breaks installworld for me with >>> >>> ... >>> install -o root -g wheel -m 444 zh_CN.GB2312.cat >>> /usr/share/nls/zh_CN.GB2312/libc.cat >>> install -o root -g wheel -m 444 zh_CN.UTF-8.cat >>> /usr/share/nls/zh_CN.UTF-8/libc.cat >>> install -o root -g wheel -m 444 btree.3.gz /usr/share/man/man3 >>> install: btree.3.gz: No such file or directory >>> *** Error code 71 >>> ... >>> >>>> >>>> Modified: >>>> head/share/examples/etc/make.conf >>>> head/share/man/man5/make.conf.5 >>>> head/share/mk/bsd.man.mk >>>> head/share/mk/bsd.own.mk >>>> >>>> [snip] >>>> >>>> Modified: head/share/mk/bsd.man.mk >>>> ============================================================================== >>>> --- head/share/mk/bsd.man.mk Sun Apr 13 05:22:22 2014 (r264401) >>>> +++ head/share/mk/bsd.man.mk Sun Apr 13 05:22:26 2014 (r264402) >>>> @@ -30,9 +30,6 @@ >>>> # second, and there may be multiple pairs. The files >>>> # are hard-linked. >>>> # >>>> -# NO_MANCOMPRESS If you do not want unformatted manual pages to be >>>> -# compressed when they are installed. [not set] >>>> -# >>>> # NO_MLINKS If you do not want install manual page links. [not set] >>>> # >>>> # MANFILTER command to pipe the raw man page through before compressing >>>> @@ -77,10 +74,10 @@ MAN+= ${MAN${__sect}} >>>> _manpages: >>>> all-man: _manpages >>>> >>>> -.if defined(NO_MANCOMPRESS) >>>> +.if ${MK_MANCOMPRESS} != "no" >>>> >>>> # Make special arrangements to filter to a temporary file at build time >>>> -# for NO_MANCOMPRESS. >>>> +# for MK_MANCOMPRESS == no. >>>> .if defined(MANFILTER) >>>> FILTEXTENSION= .filt >>>> .else >>>> @@ -162,7 +159,7 @@ maninstall: _maninstall >>>> _maninstall: >>>> .if defined(MAN) && !empty(MAN) >>>> _maninstall: ${MAN} >>>> -.if defined(NO_MANCOMPRESS) >>>> +.if ${MK_MANCOMPRESS} == "no" >>> >>> Changing this line to ".if ${MK_MANCOMPRESS} != "no" seems to fix the problem. >>> >>>> .if defined(MANFILTER) >>>> [snip] >> > <btree_failure.log>help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E2A7A22E-91AE-4034-A40C-C617CD564B5D>