From owner-svn-src-all@freebsd.org Wed Jan 27 19:19:48 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D32DAA6F1F3; Wed, 27 Jan 2016 19:19:48 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id B0CC9185E; Wed, 27 Jan 2016 19:19:48 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [IPv6:::1]) by freefall.freebsd.org (Postfix) with ESMTP id A4B8B14DE; Wed, 27 Jan 2016 19:19:48 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 6BEAA145F7; Wed, 27 Jan 2016 19:19:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id EcrUHvg-DO2r; Wed, 27 Jan 2016 19:19:45 +0000 (UTC) Subject: Re: svn commit: r294915 - head/sys/conf DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 4B6B3145EF To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201601271446.u0REkUOi081035@repo.freebsd.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Organization: FreeBSD Message-ID: <56A91853.30103@FreeBSD.org> Date: Wed, 27 Jan 2016 11:19:47 -0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <201601271446.u0REkUOi081035@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="PLX2CKJtVGdeHtcbJ3XXXkWLgeBOQATKL" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jan 2016 19:19:49 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --PLX2CKJtVGdeHtcbJ3XXXkWLgeBOQATKL Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 1/27/2016 6:46 AM, Hans Petter Selasky wrote: > =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 Wed Jan 27 14:16:13 2016 (r294914) > +++ head/sys/conf/kern.post.mk Wed Jan 27 14:46:30 2016 (r294915) > @@ -186,12 +186,23 @@ genassym.o: $S/$M/$M/genassym.c > =20 > ${SYSTEM_OBJS} genassym.o vers.o: opt_global.h > =20 > +# Normal files first > +CFILES_NORMAL=3D ${CFILES:N*/cddl/*:N*fs/nfsclient/nfs_clkdtrace*:N*/c= ompat/linuxkpi/common/*:N*/ofed/*:N*/dev/mlx5/*} > +SFILES_NORMAL=3D ${SFILES:N*/cddl/*} > + > # We have "special" -I include paths for zfs/dtrace files in 'depend'.= > -CFILES_NOCDDL=3D ${CFILES:N*/cddl/*:N*fs/nfsclient/nfs_clkdtrace*} > -SFILES_NOCDDL=3D ${SFILES:N*/cddl/*} > CFILES_CDDL=3D ${CFILES:M*/cddl/*} > SFILES_CDDL=3D ${SFILES:M*/cddl/*} > =20 > +# We have "special" -I include paths for LinuxKPI. > +CFILES_LINUXKPI=3D${CFILES:M*/compat/linuxkpi/common/*} > + > +# We have "special" -I include paths for OFED. > +CFILES_OFED=3D${CFILES:M*/ofed/*} > + > +# We have "special" -I include paths for MLX5. > +CFILES_MLX5=3D${CFILES:M*/dev/mlx5/*} > + > kernel-depend: .depend > # The argument list can be very long, so use make -V and xargs to > # pass it to mkdep. > @@ -220,12 +231,20 @@ DEPENDFILES_OBJS=3D ${DEPENDOBJS:O:u:C/^/. > .depend: .PRECIOUS ${SRCS} > .if ${MK_FAST_DEPEND} =3D=3D "no" > rm -f ${.TARGET}.tmp > - ${MAKE} -V CFILES_NOCDDL -V SYSTEM_CFILES -V GEN_CFILES | \ > +# C files > + ${MAKE} -V CFILES_NORMAL -V SYSTEM_CFILES -V GEN_CFILES | \ > CC=3D"${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${CFLAGS} > ${MAKE} -V CFILES_CDDL | \ > CC=3D"${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${ZFS_CFLAGS}= \ > ${FBT_CFLAGS} ${DTRACE_CFLAGS} > - ${MAKE} -V SFILES_NOCDDL | \ > + ${MAKE} -V CFILES_LINUXKPI | \ > + CC=3D"${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp \ > + ${CFLAGS} ${LINUXKPI_INCLUDES} > + ${MAKE} -V CFILES_OFED -V CFILES_MLX5 | \ > + CC=3D"${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp \ > + ${CFLAGS} ${OFEDINCLUDES} > +# Assembly files > + ${MAKE} -V SFILES_NORMAL | \ > CC=3D"${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${ASM_CFLAGS}= > ${MAKE} -V SFILES_CDDL | \ > CC=3D"${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${ZFS_ASM_CFL= AGS} >=20 I plan to nuke this code quite soon in favor of FAST_DEPEND. None of this or related hacks will be needed anymore. --=20 Regards, Bryan Drewery --PLX2CKJtVGdeHtcbJ3XXXkWLgeBOQATKL Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJWqRhTAAoJEDXXcbtuRpfPwbAIAKVqIlZdHb/CzFsvIINKl7AM q/lzXlEMKeMU0B2eQQOI9GaJGEBsBi2Var+poQszkCGX/fHchNgs4opW8Xg3rc/o xnQ6AlVlJavCpIfMDDL+bHkfAjL5mSY0G6NdbkzlIDhuQoWXnD5bCzYIHaAAC3C7 ubWwlESs+ldrkvxV/SGrJehBY0wCNvsBwC62ZaCMH3nNnM8blFi4nZ8f9z0KP/Wv e+E5h2gR+uXGW0neHm/AmgUalwzO2VuCLHLBQaFwza/oW0oLstp2wXv47dt40e7M lFsvkGDAxUFXIUZv7H4IMTfgsgQgJRfrdOyOzCpyqcyELlYcRmCLyt3NIc9g68w= =3kJ4 -----END PGP SIGNATURE----- --PLX2CKJtVGdeHtcbJ3XXXkWLgeBOQATKL--