From owner-cvs-src@FreeBSD.ORG Tue Sep 21 20:58:46 2004 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AE2BC16A4CE; Tue, 21 Sep 2004 20:58:46 +0000 (GMT) Received: from tigra.ip.net.ua (tigra.ip.net.ua [82.193.96.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id C513E43D1F; Tue, 21 Sep 2004 20:58:45 +0000 (GMT) (envelope-from ru@ip.net.ua) Received: from localhost (oak.ip.net.ua [82.193.96.2]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id i8LKwi1P032265; Tue, 21 Sep 2004 23:58:44 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: from tigra.ip.net.ua ([82.193.96.10]) by localhost (rocky.ipnet [82.193.96.2]) (amavisd-new, port 10024) with LMTP id 96599-06; Tue, 21 Sep 2004 23:58:43 +0300 (EEST) Received: from heffalump.ip.net.ua (heffalump.ip.net.ua [82.193.96.213]) by tigra.ip.net.ua (8.12.11/8.12.11) with ESMTP id i8LKwhOw032262 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 21 Sep 2004 23:58:43 +0300 (EEST) (envelope-from ru@ip.net.ua) Received: (from ru@localhost) by heffalump.ip.net.ua (8.13.1/8.13.1) id i8LKwak5033060; Tue, 21 Sep 2004 23:58:36 +0300 (EEST) (envelope-from ru) Date: Tue, 21 Sep 2004 23:58:36 +0300 From: Ruslan Ermilov To: Dag-Erling Smorgrav Message-ID: <20040921205835.GA32943@ip.net.ua> References: <200409211901.i8LJ1m1a076732@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="rwEMma7ioTxnRzrJ" Content-Disposition: inline In-Reply-To: <200409211901.i8LJ1m1a076732@repoman.freebsd.org> User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new at ip.net.ua cc: cvs-src@freebsd.org cc: src-committers@freebsd.org cc: cvs-all@freebsd.org Subject: Re: cvs commit: src Makefile.inc1 src/contrib/bind9 FREEBSD-Upgrade config.h src/etc Makefile src/etc/mtree BSD.include.dist BSD.root.dist src/lib Makefile src/lib/bind Makefile config.h config.mk src/lib/bind/bind Makefile config.h port_after.h ... X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Sep 2004 20:58:46 -0000 --rwEMma7ioTxnRzrJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi DES, There's a slight problem with your commit to Makefile.inc1: %%% Index: Makefile.inc1 =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: /home/ncvs/src/Makefile.inc1,v retrieving revision 1.446 diff -u -r1.446 Makefile.inc1 --- Makefile.inc1 21 Sep 2004 19:01:41 -0000 1.446 +++ Makefile.inc1 21 Sep 2004 20:45:18 -0000 @@ -902,9 +902,6 @@ =20 .if !defined(NO_BIND) _prebuild_libs+=3D lib/libpthread -_generic_libs+=3D lib/bind - -lib/bind__L: lib/libpthread__L .endif =20 _generic_libs+=3D lib %%% Since lib/bind is not in the list of "prebuild" libs (no other libraries depend on it), you don't need to add lib/bind to _generic_libs (it will be built by "lib"), and similarly the "__L" interdependencies are redundant. In general, the list of prebuild libraries and their inter-dependencies is generated by src/tools/make-libdeps.sh. By applying the diff above you will again make it consistent with the script's output. Probably more important that your commit broke the sparc64 and alpha ports builds because on sparc64 and alpha libpthread is still installed as "libkse", here's a relevant bit from src/lib/libpthread/Makefile: : .if ${MACHINE_ARCH} =3D=3D "alpha" || ${MACHINE_ARCH} =3D=3D "sparc64" : LIB=3Dkse : .else : LIB=3Dpthread : .endif On these architectures, libc_r is symlinked to libpthread, so you need to add lib/libc_r instead of lib/libpthread on alpha and amd64 to _prebuild_libs. Now NOLIBPTHREAD and NOLIBC_R builds (arch dependent) will also require one to specify NO_BIND. This dependency should either be enforced or at least documented. Cheers, --=20 Ruslan Ermilov ru@FreeBSD.org FreeBSD committer --rwEMma7ioTxnRzrJ Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBUJX7qRfpzJluFF4RAlyQAJ40MO+6uc36RYHOEq0GxQ6uAJeXSACcCDao NNc0EnziV9/onzp2IPkvN28= =Aiw/ -----END PGP SIGNATURE----- --rwEMma7ioTxnRzrJ--