From owner-svn-src-all@freebsd.org Sat Nov 4 21:31:51 2017 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 7C286E568BC; Sat, 4 Nov 2017 21:31:51 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F2494834BE; Sat, 4 Nov 2017 21:31:50 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from thor.intern.walstatt.dynvpn.de ([78.55.49.122]) by mail.gmx.com (mrgmx001 [212.227.17.190]) with ESMTPSA (Nemesis) id 0M6BKc-1dDLk43ImA-00y8t1; Sat, 04 Nov 2017 22:31:42 +0100 Date: Sat, 4 Nov 2017 22:31:33 +0100 From: "O. Hartmann" To: "Simon J. Gerraty" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r325404 - head/share/mk Message-ID: <20171104223133.00f5bf30@thor.intern.walstatt.dynvpn.de> In-Reply-To: <201711042102.vA4L2RuR063978@repo.freebsd.org> References: <201711042102.vA4L2RuR063978@repo.freebsd.org> Organization: WALSTATT User-Agent: OutScare 3.1415926 X-Operating-System: ImNotAnOperatingSystem 3.141592527 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_/6f_D8drIBDOSB0Ag2Uz5Aj3"; protocol="application/pgp-signature" X-Provags-ID: V03:K0:0OMuNYOv1ZhbLp7QpkKwJxXQrPlpJ5qCrgAtSnRxioDkxonio7Y Py1U73qQEwFEIoYSnuiJ+jlTE1XEAOXD6trRJNVBXBntBQrpqyvp5lAvwp1drdWhyqtmhP3 BlZ/NgP4L3MN0PL7tXzy3y2yi8+DHRagH5M4/LnHhGu5bvzpw2hL6BqhuYSzy09ad8Hq+TK +K89LaZB0BIpHN00StpPA== X-UI-Out-Filterresults: notjunk:1;V01:K0:N7roxwPhfWg=:PtBgcT8ghQDB+XVmDXwNxO zcCmxD2gF/HmRJMIStZjhPpjeCGh3xtV8LXDImZsTcva8QlYz8NNf67Ht+ynGwV7niHX0bgRc vAZTw/KT9TTnXIlYivLqGevVOcO4CU/706WbJUel7QDigpBEln0breTp/+Hrn74Cova18Rz7u xQnkK1+G/7a82CQl3/HyrFO3QgvP7EHCGa7HHSJlmMike4yQwcsoDhNOCIjwEkBUl72cskX3h TibcQ9jcnC/QpULX3M7vvF2FR1bZFeu23GDj9d/EfiCyuFqszDLFX52R7LuJgYjmbxfcC4whc QPAhaMe3NgaFNx6z7KFKkgbYQPMcP7FZ0J3wYE6b2sPWylGdedMwP0KYiYZvH81b1z/Pabnaw 1v4VJ0uzRFs2m+ZC3dnd4cVHlo2P3gYIFmQ5+2+KNbqieUfm40pdKsNXAYbtUqkRNze6bB5u7 mC933U5Kwus7A1jH2JtkHjxVfqzgZe50DWoDmFo6fBZpbEr6k+igdeQZVvzrjfgvzZRKWHcS5 nBT/0l1Mpc7RjXzW9wTrqrmvmPHqjxVkzbYbIHyvgyyAibv1qtV5H0bUz1CdhEmcpHJ5Flox0 Lv1Otg9ncTZRm7ZSewDs7P1jCQ13dE3BxS4+tLjmHQsJBg0sDevG/fMUenfefnMZdIQf3H2i0 gNqQu0enJsSRQyay49tFncNKxdjoSfIB8hv1uuGUzejYz2VXgO9f5BfOu+tvYxQwoORuAGzws Ymu4U/urFrweqhfJzaknRIF8Ttxa82g55KW/kQ7Rwn2+6M4pDU4wEkAXZg29jWeyI/X0O5Wjo UrwY0ncojPo61lF4xP67zTk92WWKA== X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Sat, 04 Nov 2017 21:31:51 -0000 --Sig_/6f_D8drIBDOSB0Ag2Uz5Aj3 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Am Sat, 4 Nov 2017 21:02:27 +0000 (UTC) "Simon J. Gerraty" schrieb: > Author: sjg > Date: Sat Nov 4 21:02:26 2017 > New Revision: 325404 > URL: https://svnweb.freebsd.org/changeset/base/325404 >=20 > Log: > Ensure .OBJDIR has known value > =20 > If for any reason we cannot set .OBJDIR=3D=3D_objdir as desired > use .CURDIR so that at least the classic > .if ${.OBJDIR} !=3D ${.CURDIR} > works and dangerous misstakes can be avoided. > =20 > Reviewed by: bdrewery >=20 > Modified: > head/share/mk/auto.obj.mk >=20 > Modified: head/share/mk/auto.obj.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/share/mk/auto.obj.mk Sat Nov 4 16:23:34 2017 (r325403) > +++ head/share/mk/auto.obj.mk Sat Nov 4 21:02:26 2017 (r325404) > @@ -61,11 +61,17 @@ __objdir_made !=3D echo ${__objdir}/; umask ${OBJDIR_= UMA > .endif > # This causes make to use the specified directory as .OBJDIR > .OBJDIR: ${__objdir} > -.if ${.OBJDIR:tA} !=3D ${__objdir:tA} && ${__objdir_made:Uno:M${__objdir= }/*} !=3D "" > +.if ${.OBJDIR:tA} !=3D ${__objdir:tA} > +# we did not get what we want - do we care? > +.if ${__objdir_made:Uno:M${__objdir}/*} !=3D "" > # watch out for __objdir being relative path > .if !(${__objdir:M/*} =3D=3D "" && ${.OBJDIR:tA} =3D=3D ${${.CURDIR}/${_= _objdir}:L:tA}) > .error could not use ${__objdir}: .OBJDIR=3D${.OBJDIR} > .endif > +.endif > +# apparently we can live with it > +# make sure we know what we have > +.OBJDIR: ${.CURDIR} > .endif > .endif > .endif > _______________________________________________ > 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" With the recent patches, nvidia driver x11/nvidia-driver fails tobuild with= the error shown below: [...] =3D=3D=3D> src/nvidia (all) make[7]: "/usr/src/share/mk/bsd.obj.mk" line 87: Malformed conditional (${CANONICALOBJDIR} =3D=3D /${RELDIR} || ${.OBJDIR} =3D=3D /${RELDIR}) make= [7]: Fatal errors encountered -- cannot continue [...] --=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_/6f_D8drIBDOSB0Ag2Uz5Aj3 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iLUEARMKAB0WIQQZVZMzAtwC2T/86TrS528fyFhYlAUCWf4xtgAKCRDS528fyFhY lPnyAf9i3azMTgv+TNIvOWqeTR8BGaV4bTbFTcEuxAny/u5QKb8pt60l0KvZ4199 awsQ/1RNYlzShMXP3aEOlVzGVWwKAf9gRR0I5s92drJ46UkUBrwMTL7UBgRb+sac LglcJR5D9lu95ihBRqcpqLPQ5z6e4RyFFsgAOO1AnXWpswjsPH6Z =Kf6V -----END PGP SIGNATURE----- --Sig_/6f_D8drIBDOSB0Ag2Uz5Aj3--