Date: Sat, 27 Jan 2018 21:47:48 +0100 From: "O. Hartmann" <ohartmann@walstatt.org> To: "Jason A. Harmening" <jah@FreeBSD.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r328489 - head/sys/conf Message-ID: <20180127214755.3c59661e@thor.intern.walstatt.dynvpn.de> In-Reply-To: <201801272013.w0RKDaMU098200@repo.freebsd.org> References: <201801272013.w0RKDaMU098200@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Sig_/sA+P+_lPY2npag1RR.K74Kv Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am Sat, 27 Jan 2018 20:13:36 +0000 (UTC) "Jason A. Harmening" <jah@FreeBSD.org> schrieb: > Author: jah > Date: Sat Jan 27 20:13:36 2018 > New Revision: 328489 > URL: https://svnweb.freebsd.org/changeset/base/328489 >=20 > Log: > Remove system makefile path directives from env passed to PORTS_MODULES= step > =20 > Previously, MAKESYSPATH as well as '-m' directives in MAKEFLAGS would c= ause > any port rebuilt during the PORTS_MODULES stage to consume system makef= iles > 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 uti= lity > the port may also happen to install. > =20 > Before 11.0, this probably didn't matter much in practice. But the add= ition > of src.libnames.mk under $(SRCROOT)/share/mk in 11.0 breaks any consume= r of > bsd.prog.mk and DPADD/LDADD during PORTS_MODULES. > =20 > 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> > =20 > Reviewed by: bdrewery > MFC after: 2 weeks > Differential Revision: https://reviews.freebsd.org/D13053 >=20 > Modified: > head/sys/conf/kern.post.mk >=20 > Modified: head/sys/conf/kern.post.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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=3D\ > -u CC \ > -u CXX \ > -u CPP \ > + -u MAKESYSPATH \ > + MAKEFLAGS=3D"${MAKEFLAGS:M*:tW:S/^-m /-m_/g:S/ -m / -m_/g:tw:N-m_*}" \ > + SYSDIR=3D${SYSDIR} \ > PATH=3D${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin \ > SRC_BASE=3D${SRC_BASE} \ > OSVERSION=3D${OSRELDATE} \ > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" This happens now if PORTS_MODULE=3Dx11/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/NVI= DIA-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/N= VIDIA-FreeBSD-x86_64-387.34/src *** Error code 1 --=20 O. Hartmann Ich widerspreche der Nutzung oder =C3=9Cbermittlung meiner Daten f=C3=BCr Werbezwecke oder f=C3=BCr die Markt- oder Meinungsforschung (=C2=A7 28 Abs.= 4 BDSG). --Sig_/sA+P+_lPY2npag1RR.K74Kv Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iLUEARMKAB0WIQQZVZMzAtwC2T/86TrS528fyFhYlAUCWmzlkAAKCRDS528fyFhY lHERAgCnZqrBzG2NQwN6yYC6zhPafKltGMg/n0A2CBuXOMcxE7UHUG1Mx5bw09WD P7iGob0X/GJah3VnKa31NgqEKebDAf4oSxgCC6FgymSDlqREDKxxuvx/HZbXoWhX x8GpBN53mLreslFdXqUriBQ1ZePYTN8IkHMSc1UkWeITCahnhcon =47Zy -----END PGP SIGNATURE----- --Sig_/sA+P+_lPY2npag1RR.K74Kv--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20180127214755.3c59661e>