svn commit: r290812 - head

[Konstantin Belousov]

On Tue, Nov 17, 2015 at 11:01:28AM -0800, Bryan Drewery wrote:
> On 11/17/15 12:55 AM, Konstantin Belousov wrote:
> > On Sat, Nov 14, 2015 at 01:45:37AM +0000, Bryan Drewery wrote:
> >> Author: bdrewery
> >> Date: Sat Nov 14 01:45:37 2015
> >> New Revision: 290812
> >> URL: https://svnweb.freebsd.org/changeset/base/290812
> >>
> >> Log:
> >>   Avoid setting schg in the objtree for lib32 build.
> >>   
> >>   Reported by:	kib
> >>   Sponsored by:	EMC / Isilon Storage Division
> >>   MFC after:	1 week
> >>
> >> Modified:
> >>   head/Makefile.inc1
> >>
> >> Modified: head/Makefile.inc1
> >> ==============================================================================
> >> --- head/Makefile.inc1	Sat Nov 14 01:40:12 2015	(r290811)
> >> +++ head/Makefile.inc1	Sat Nov 14 01:45:37 2015	(r290812)
> >> @@ -716,10 +716,10 @@ build32: .PHONY
> >>  	    build-tools
> >>  .endfor
> >>  	${_+_}cd ${.CURDIR}; \
> >> -	    ${LIB32WMAKE} -f Makefile.inc1 libraries
> >> +	    ${LIB32WMAKE} -f Makefile.inc1 -DNO_FSCHG libraries
> >>  .for _t in obj depend all
> >>  	${_+_}cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32WMAKE} \
> >> -	    DIRPRFX=libexec/rtld-elf/ ${_t}
> >> +	    -DNO_FSCHG DIRPRFX=libexec/rtld-elf/ ${_t}
> >>  	${_+_}cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} \
> >>  	    DIRPRFX=usr.bin/ldd ${_t}
> >>  .endfor
> > Thank you.
> > 
> > I remember, the previous attempts to fix this broke setting the noschg flag
> > on the compat32 install.  This one seems to be correct, am I right ?
> > 
> 
> Yes, the actual install is still safely setting schg.
> 
> I am curious about your make.conf and src.conf though as I was unable to
> reproduce the problem, but see evidence that this would fix it.

I have
INSTALL?= install
INSTALL+=-CS
in make.conf.

src.conf is
WITHOUT_PROFILE=yes
but this should be not relevant.