Am Sat, 27 Jan 2018 20:13:36 +0000 (UTC) "Jason A. Harmening" <j...@freebsd.org> schrieb:
> Author: jah > Date: Sat Jan 27 20:13:36 2018 > New Revision: 328489 > URL: https://svnweb.freebsd.org/changeset/base/328489 > > Log: > Remove system makefile path directives from env passed to PORTS_MODULES step > > Previously, MAKESYSPATH as well as '-m' directives in MAKEFLAGS would cause > any port rebuilt during the PORTS_MODULES stage to consume system makefiles > from $(SRCROOT)/share/mk instead of those installed under /usr/share/mk. > For kernel modules that need to build against an updated src tree this > makes sense; less so for <bsd.port.mk> or any userspace library or utility > the port may also happen to install. > > Before 11.0, this probably didn't matter much in practice. But the addition > of src.libnames.mk under $(SRCROOT)/share/mk in 11.0 breaks any consumer of > bsd.prog.mk and DPADD/LDADD during PORTS_MODULES. > > Address the build breakage by removing MAKESYSPATH and any occurrence of > '-m' from MAKEFLAGS in the environment created for the port build. > Instead set SYSDIR so that any kmod built by the port will still consume > conf/kmod.mk from the updated src tree, assuming it uses <bsd.kmod.mk> > > Reviewed by: bdrewery > MFC after: 2 weeks > Differential Revision: https://reviews.freebsd.org/D13053 > > Modified: > head/sys/conf/kern.post.mk > > Modified: head/sys/conf/kern.post.mk > ============================================================================== > --- head/sys/conf/kern.post.mk Sat Jan 27 19:23:42 2018 > (r328488) > +++ head/sys/conf/kern.post.mk Sat Jan 27 20:13:36 2018 > (r328489) > @@ -69,6 +69,9 @@ PORTSMODULESENV=\ > -u CC \ > -u CXX \ > -u CPP \ > + -u MAKESYSPATH \ > + MAKEFLAGS="${MAKEFLAGS:M*:tW:S/^-m /-m_/g:S/ -m / -m_/g:tw:N-m_*}" \ > + SYSDIR=${SYSDIR} \ > PATH=${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin \ > SRC_BASE=${SRC_BASE} \ > OSVERSION=${OSRELDATE} \ > _______________________________________________ > svn-src-h...@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org" This happens now if PORTS_MODULE=x11/nvidia-driver is defined in /etc/src.conf: [...] --- kernel-install --- mkdir -p /boot/kernel install -p -m 555 -o root -g wheel kernel /boot/kernel/ --- ports-install --- Variable OBJTOP is recursive. make[8]: stopped in /usr/obj/usr/src/amd64.amd64/sys/FY/usr/ports/x11/nvidia-driver/work/NVIDIA-FreeBSD-x86_64-387.34/src/nvidia *** Error code 2 Stop. make[7]: stopped in /usr/obj/usr/src/amd64.amd64/sys/THOR/usr/ports/x11/nvidia-driver/work/NVIDIA-FreeBSD-x86_64-387.34/src *** Error code 1 -- O. Hartmann Ich widerspreche der Nutzung oder Übermittlung meiner Daten für Werbezwecke oder für die Markt- oder Meinungsforschung (§ 28 Abs. 4 BDSG).
pgpAuRP5P2NWc.pgp
Description: OpenPGP digital signature
