Subject: Re: bin/24020: install in src/x11/bin/ssh-askpass fails if using -j N
To: None <toolchain-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Luke Mewburn <lukem@NetBSD.org>
List: netbsd-bugs
Date: 08/06/2007 04:25:03
The following reply was made to PR toolchain/24020; it has been noted by GNATS.

From: Luke Mewburn <lukem@NetBSD.org>
To: Havard Eidnes <he@NetBSD.org>
Cc: jmmv@menta.net, gnats-bugs@NetBSD.org, lukem@netbsd.org,
	gson@netbsd.org
Subject: Re: bin/24020: install in src/x11/bin/ssh-askpass fails if using -j N
Date: Mon, 6 Aug 2007 14:23:32 +1000

 --GXk5ufetu984H6pr
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 On Mon, Jul 30, 2007 at 08:10:45PM +0200, Havard Eidnes wrote:
   | a colleague and myself toyed around a bit with this, and didn't
   | really understand why all that complicated renaming back and forth
   | is necessary at all, especially since it doesn't really work...
   |=20
   | So, I think that by simplifying the Makefile we managed to make this
   | finally work robustly, and the diff is
 
 
 I tested this to some degree, and it's slightly broken.
 Adding back the BUILDSYMLINKS line fixed it.
 (Maybe you have a stale SshAskpass.ad in your source tree?)
 
 
   |=20
   |=20
   | Index: Makefile
   | =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
   | RCS file: /cvsroot/src/x11/bin/ssh-askpass/Makefile,v
   | retrieving revision 1.4
   | diff -u -r1.4 Makefile
   | --- Makefile	29 Jan 2004 01:00:42 -0000	1.4
   | +++ Makefile	30 Jul 2007 17:20:09 -0000
   | @@ -9,22 +9,10 @@
   | =20
   |  APPDEFS=3D	SshAskpass.ad
   | =20
   | -BUILDSYMLINKS=3D	SshAskpass-default.ad SshAskpass.ad
   | -
   |  FILESDIR=3D	${X11ROOTDIR}/share/examples/ssh-askpass
   |  FILES=3D		SshAskpass-1337.ad SshAskpass-NeXTish.ad \
   | -		SshAskpass.ad SshAskpass-green.ad SshAskpass-motif.ad
   | -
   | -# XXX:	We use the following two lines instead of just having
   | -# XXX:		FILES+=3D SshAskpass-default.ad
   | -# XXX:	because of an obscure bug with "make -j" where it doesn't find
   | -# XXX:	SshAskpass-default.ad in the .PATH correctly, probably because
   | -# XXX:	of the rule created for it from BUILDSYMLINKS by <bsd.files.mk>.
   | -# XXX:	This is not the correct long-term solution.
   | -#
   | -FILES+=3D			SshAskpass.ad
   | -FILESNAME_SshAskpass.ad=3DSshAskpass-default.ad
   | -
   | +		SshAskpass-green.ad SshAskpass-motif.ad \
   | +		SshAskpass-default.ad
   | =20
   |  CPPFLAGS+=3D	-I.
   |  DPSRCS+=3D	SshAskpass_ad.h
   |=20
   |=20
   | In the .PATHed in source directory, SshAskpass.ad is already a
   | symlink to SshAskpass-default.ad.  One may then simply install
   | SshAskpass-default.ad directly instead of doing that complicated
   | dance.
   |=20
   | On our test system (4-cpu i386) doing "make install -j 5" now works
   | fine where it didn't before.
   |=20
   | No file or symlink appears to be created under $DESTDIR by the
   | handling of the BUILDSYMLINKS variable, so we just removed that as
   | well.  However, that should be OK because the set lists don't
   | mention it either -- a distribution + sets build now completes
   | nicely.
   |=20
   | It would however be nice to know if applying the above patch fixes
   | the problem for others as well.
   |=20
   | Regards,
   |=20
   | - Havard
 
 --GXk5ufetu984H6pr
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (NetBSD)
 
 iD8DBQFGtqJEpBhtmn8zJHIRAlS8AJ4vbMXkQkGwgSsR4INXEkH5jZywzwCeMTCn
 vf9uZt+P/BviqVSV2xAmrrg=
 =FWPF
 -----END PGP SIGNATURE-----
 
 --GXk5ufetu984H6pr--