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 ...

[Ruslan Ermilov]

Hi DES,

There's a slight problem with your commit to Makefile.inc1:

%%%
Index: Makefile.inc1
===================================================================
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 @@
 
 .if !defined(NO_BIND)
 _prebuild_libs+= lib/libpthread
-_generic_libs+=	lib/bind
-
-lib/bind__L: lib/libpthread__L
 .endif
 
 _generic_libs+=	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} == "alpha" || ${MACHINE_ARCH} == "sparc64"
: LIB=kse
: .else
: LIB=pthread
: .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,
-- 
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-all/attachments/20040921/9083c513/attachment.bin