[src/trunk]: src If a library needs a symbol from another library, pull that ...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ee1bf65c1454
branches:  trunk
changeset: 789871:ee1bf65c1454
user:      joerg <joerg%NetBSD.org@localhost>
date:      Wed Sep 11 23:04:09 2013 +0000

description:
If a library needs a symbol from another library, pull that library in
explicitly, even if the DT_NEEDED closure would normally already ensure
the presence.

diffstat:

 crypto/external/bsd/heimdal/lib/libasn1/Makefile      |   3 ++-
 crypto/external/bsd/heimdal/lib/libhdb/Makefile       |   3 ++-
 crypto/external/bsd/heimdal/lib/libheimntlm/Makefile  |   8 +++++---
 crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile |   3 ++-
 crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile  |   3 ++-
 crypto/external/bsd/heimdal/lib/libkafs/Makefile      |   3 ++-
 crypto/external/bsd/heimdal/lib/libkdc/Makefile       |   5 ++++-
 crypto/external/bsd/heimdal/lib/libkrb5/Makefile      |   5 +++--
 crypto/external/bsd/libsaslc/lib/Makefile             |   3 ++-
 external/bsd/bind/lib/Makefile                        |   8 ++------
 external/bsd/bind/lib/libbind9/Makefile               |   6 +++++-
 external/bsd/bind/lib/libdns/Makefile                 |   4 +++-
 external/bsd/bind/lib/libisccc/Makefile               |   4 +++-
 external/bsd/bind/lib/libisccfg/Makefile              |   5 ++++-
 external/bsd/libdwarf/lib/Makefile                    |   4 +++-
 external/bsd/libevent/lib/Makefile                    |   4 ++--
 external/bsd/libevent/lib/libevent_openssl/Makefile   |   8 +++++---
 external/bsd/libevent/lib/libevent_pthreads/Makefile  |   9 +++++----
 external/bsd/openldap/bin/Makefile.inc                |   6 +++---
 external/cddl/osnet/lib/Makefile                      |   3 ++-
 external/cddl/osnet/lib/libzfs/Makefile               |  13 ++++++++++---
 external/cddl/osnet/lib/libzpool/Makefile             |  11 ++++++++---
 external/gpl2/lvm2/lib/libdevmapper/Makefile          |   4 ++--
 lib/Makefile                                          |   7 ++++---
 lib/libdm/Makefile                                    |   5 ++---
 lib/libisns/Makefile                                  |   4 +++-
 lib/libp2k/Makefile                                   |   5 +++--
 lib/libppath/Makefile                                 |   4 +++-
 lib/libukfs/Makefile                                  |   5 +++--
 lib/npf/mod.mk                                        |   4 +++-
 share/mk/bsd.lua.mk                                   |   5 ++++-
 31 files changed, 106 insertions(+), 58 deletions(-)

diffs (truncated from 594 to 300 lines):

diff -r 65ee03f9db0e -r ee1bf65c1454 crypto/external/bsd/heimdal/lib/libasn1/Makefile
--- a/crypto/external/bsd/heimdal/lib/libasn1/Makefile  Wed Sep 11 18:53:54 2013 +0000
+++ b/crypto/external/bsd/heimdal/lib/libasn1/Makefile  Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:48 elric Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
 
 USE_FORT?= yes # network protocol library
 
@@ -10,6 +10,7 @@
 LIB=           asn1
 
 LIBDPLIBS+=    com_err ${.CURDIR}/../libcom_err
+LIBDPLIBS+=    roken   ${.CURDIR}/../libroken
 
 HEIMSRCS =             \
        asn1_err.et     \
diff -r 65ee03f9db0e -r ee1bf65c1454 crypto/external/bsd/heimdal/lib/libhdb/Makefile
--- a/crypto/external/bsd/heimdal/lib/libhdb/Makefile   Wed Sep 11 18:53:54 2013 +0000
+++ b/crypto/external/bsd/heimdal/lib/libhdb/Makefile   Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/11 23:04:09 joerg Exp $
 
 USE_FORT?= yes # network protocol library
 
@@ -13,6 +13,7 @@
 
 LIBDPLIBS+=    hx509           ${HEIMBASE}/lib/libhx509        \
                crypto          ${SSLBASE}/lib/libcrypto        \
+               krb5            ${HEIMBASE}/lib/libkrb5         \
                asn1            ${HEIMBASE}/lib/libasn1         \
                com_err         ${HEIMBASE}/lib/libcom_err      \
                roken           ${HEIMBASE}/lib/libroken        \
diff -r 65ee03f9db0e -r ee1bf65c1454 crypto/external/bsd/heimdal/lib/libheimntlm/Makefile
--- a/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile      Wed Sep 11 18:53:54 2013 +0000
+++ b/crypto/external/bsd/heimdal/lib/libheimntlm/Makefile      Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:51 elric Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
 
 USE_FORT?= yes # cryptographic software
 
@@ -11,8 +11,10 @@
 
 LIB=           heimntlm
 
-LIBDPLIBS+=    asn1    ${.CURDIR}/../libasn1 \
-               krb5    ${.CURDIR}/../libkrb5 \
+LIBDPLIBS+=    asn1    ${.CURDIR}/../libasn1 \
+               com_err ${.CURDIR}/../libcom_err \
+               crypto  ${SSLBASE}/lib/libcrypto \
+               krb5    ${.CURDIR}/../libkrb5 \
                roken   ${.CURDIR}/../libroken
 
 HEIMSRCS= ntlm_err.et ntlm.c
diff -r 65ee03f9db0e -r ee1bf65c1454 crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
--- a/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile     Wed Sep 11 18:53:54 2013 +0000
+++ b/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile     Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/04/15 14:39:32 elric Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/11 23:04:09 joerg Exp $
 
 USE_FORT?= yes # network protocol library
 
@@ -12,6 +12,7 @@
 LIB=           kadm5clnt
 
 LIBDPLIBS+=    krb5    ${.CURDIR}/../libkrb5 \
+               com_err ${.CURDIR}/../libcom_err \
                hdb     ${.CURDIR}/../libhdb \
                roken   ${.CURDIR}/../libroken
 
diff -r 65ee03f9db0e -r ee1bf65c1454 crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile
--- a/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile      Wed Sep 11 18:53:54 2013 +0000
+++ b/crypto/external/bsd/heimdal/lib/libkadm5srv/Makefile      Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:52 elric Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
 
 USE_FORT?= yes # network protocol library
 
@@ -12,6 +12,7 @@
 LIB=           kadm5srv
 
 LIBDPLIBS+=    krb5    ${.CURDIR}/../libkrb5 \
+               com_err ${.CURDIR}/../libcom_err \
                hdb     ${.CURDIR}/../libhdb \
                roken   ${.CURDIR}/../libroken
 
diff -r 65ee03f9db0e -r ee1bf65c1454 crypto/external/bsd/heimdal/lib/libkafs/Makefile
--- a/crypto/external/bsd/heimdal/lib/libkafs/Makefile  Wed Sep 11 18:53:54 2013 +0000
+++ b/crypto/external/bsd/heimdal/lib/libkafs/Makefile  Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:53 elric Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
 
 USE_FORT?= yes # network protocol library
 
@@ -12,6 +12,7 @@
 LIB=           kafs
 
 LIBDPLIBS+=    krb5    ${.CURDIR}/../libkrb5 \
+               asn1    ${.CURDIR}/../libasn1 \
                roken   ${.CURDIR}/../libroken
 
 SRCS=          afssys.c afskrb5.c common.c
diff -r 65ee03f9db0e -r ee1bf65c1454 crypto/external/bsd/heimdal/lib/libkdc/Makefile
--- a/crypto/external/bsd/heimdal/lib/libkdc/Makefile   Wed Sep 11 18:53:54 2013 +0000
+++ b/crypto/external/bsd/heimdal/lib/libkdc/Makefile   Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:53 elric Exp $
+# $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -11,7 +11,10 @@
 LIB=           kdc
 
 LIBDPLIBS+=    krb5            ${.CURDIR}/../libkrb5           \
+               crypto          ${SSLBASE}/lib/libcrypto        \
                hdb             ${.CURDIR}/../libhdb            \
+               hx509           ${.CURDIR}/../libhx509          \
+               asn1            ${.CURDIR}/../libasn1           \
                heimntlm        ${.CURDIR}/../libheimntlm       \
                roken           ${.CURDIR}/../libroken
 
diff -r 65ee03f9db0e -r ee1bf65c1454 crypto/external/bsd/heimdal/lib/libkrb5/Makefile
--- a/crypto/external/bsd/heimdal/lib/libkrb5/Makefile  Wed Sep 11 18:53:54 2013 +0000
+++ b/crypto/external/bsd/heimdal/lib/libkrb5/Makefile  Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/07/31 06:43:56 plunky Exp $
+# $NetBSD: Makefile,v 1.7 2013/09/11 23:04:09 joerg Exp $
 
 USE_FORT?= yes # network protocol library
 
@@ -21,7 +21,8 @@
                com_err         ${HEIMBASE}/lib/libcom_err      \
                roken           ${HEIMBASE}/lib/libroken        \
                wind            ${HEIMBASE}/lib/libwind         \
-               heimbase        ${HEIMBASE}/lib/libheimbase
+               heimbase        ${HEIMBASE}/lib/libheimbase     \
+               crypt           ${NETBSDSRCDIR}/lib/libcrypt
 
 HEIMSRCS= krb_err.et krb5_err.et heim_err.et k524_err.et
 
diff -r 65ee03f9db0e -r ee1bf65c1454 crypto/external/bsd/libsaslc/lib/Makefile
--- a/crypto/external/bsd/libsaslc/lib/Makefile Wed Sep 11 18:53:54 2013 +0000
+++ b/crypto/external/bsd/libsaslc/lib/Makefile Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/09/23 15:24:35 jruoho Exp $
+# $NetBSD: Makefile,v 1.8 2013/09/11 23:04:09 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -54,6 +54,7 @@
 INCS+= saslc.h
 INCSDIR=/usr/include
 
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
 LIBDPLIBS+= ssl ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl
 .if (${MKKERBEROS} != "no")
 LIBDPLIBS+= gssapi ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/lib/libgssapi
diff -r 65ee03f9db0e -r ee1bf65c1454 external/bsd/bind/lib/Makefile
--- a/external/bsd/bind/lib/Makefile    Wed Sep 11 18:53:54 2013 +0000
+++ b/external/bsd/bind/lib/Makefile    Wed Sep 11 23:04:09 2013 +0000
@@ -1,9 +1,5 @@
-#      $NetBSD: Makefile,v 1.1 2009/04/12 03:46:10 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2013/09/11 23:04:09 joerg Exp $
 
-# XXX These bind9/ISC libraries should depend on each other but the
-# XXX dependency ordering requires considerable investigation.
-# XXX Please preserve the order below so we know the order ISC links
-# XXX them in in their Makefiles.
-SUBDIR+= libbind9 libdns liblwres libisccfg libisccc libisc
+SUBDIR+= libisc liblwres .WAIT libdns libisccc .WAIT libisccfg .WAIT libbind9
 
 .include <bsd.subdir.mk>
diff -r 65ee03f9db0e -r ee1bf65c1454 external/bsd/bind/lib/libbind9/Makefile
--- a/external/bsd/bind/lib/libbind9/Makefile   Wed Sep 11 18:53:54 2013 +0000
+++ b/external/bsd/bind/lib/libbind9/Makefile   Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2009/04/12 03:46:10 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2013/09/11 23:04:10 joerg Exp $
 
 LIB=bind9
 
@@ -13,4 +13,8 @@
 
 SRCS=  check.c getaddresses.c version.c
 
+LIBDPLIBS+=    isc     ${.CURDIR}/../libisc \
+               dns     ${.CURDIR}/../libdns \
+               isccfg  ${.CURDIR}/../libisccfg \
+
 .include <bsd.lib.mk>
diff -r 65ee03f9db0e -r ee1bf65c1454 external/bsd/bind/lib/libdns/Makefile
--- a/external/bsd/bind/lib/libdns/Makefile     Wed Sep 11 18:53:54 2013 +0000
+++ b/external/bsd/bind/lib/libdns/Makefile     Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2013/07/27 19:23:14 christos Exp $
+#      $NetBSD: Makefile,v 1.12 2013/09/11 23:04:10 joerg Exp $
 
 LIB=dns
 #USE_SHLIBDIR=   yes
@@ -10,6 +10,8 @@
 DIST=  ${IDIST}/lib/dns
 .include "${DIST}/api"
 
+LIBDPLIBS+=    isc     ${.CURDIR}/../libisc
+
 .PATH.c:       ${DIST}/unix ${DIST}/sec/dst ${DIST}
 CPPFLAGS+=     -I${BIND_SRCDIR}/include/dns -I${DIST}
 
diff -r 65ee03f9db0e -r ee1bf65c1454 external/bsd/bind/lib/libisccc/Makefile
--- a/external/bsd/bind/lib/libisccc/Makefile   Wed Sep 11 18:53:54 2013 +0000
+++ b/external/bsd/bind/lib/libisccc/Makefile   Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2009/04/12 03:46:10 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2013/09/11 23:04:10 joerg Exp $
 
 LIB=isccc
 
@@ -6,6 +6,8 @@
 
 .include "${.CURDIR}/../Makefile.inc"
 
+LIBDPLIBS+=    isc     ${.CURDIR}/../libisc
+
 DIST=  ${IDIST}/lib/isccc
 .include "${DIST}/api"
 
diff -r 65ee03f9db0e -r ee1bf65c1454 external/bsd/bind/lib/libisccfg/Makefile
--- a/external/bsd/bind/lib/libisccfg/Makefile  Wed Sep 11 18:53:54 2013 +0000
+++ b/external/bsd/bind/lib/libisccfg/Makefile  Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2009/04/12 03:46:10 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2013/09/11 23:04:10 joerg Exp $
 
 LIB=isccfg
 
@@ -6,6 +6,9 @@
 
 .include "${.CURDIR}/../Makefile.inc"
 
+LIBDPLIBS+=    isc     ${.CURDIR}/../libisc \
+               dns     ${.CURDIR}/../libdns
+
 DIST=  ${IDIST}/lib/isccfg
 .include "${DIST}/api"
 
diff -r 65ee03f9db0e -r ee1bf65c1454 external/bsd/libdwarf/lib/Makefile
--- a/external/bsd/libdwarf/lib/Makefile        Wed Sep 11 18:53:54 2013 +0000
+++ b/external/bsd/libdwarf/lib/Makefile        Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2013/01/18 16:22:35 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2013/09/11 23:04:10 joerg Exp $
 
 .include <bsd.init.mk>
 
@@ -26,4 +26,6 @@
 
 WITHOUT_MAN=   yes
 
+LIBDPLIBS+=    elf             ${NETBSDSRCDIR}/external/bsd/libelf/lib
+
 .include <bsd.lib.mk>
diff -r 65ee03f9db0e -r ee1bf65c1454 external/bsd/libevent/lib/Makefile
--- a/external/bsd/libevent/lib/Makefile        Wed Sep 11 18:53:54 2013 +0000
+++ b/external/bsd/libevent/lib/Makefile        Wed Sep 11 23:04:09 2013 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.2 2013/04/11 16:59:16 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2013/09/11 23:04:10 joerg Exp $
 .include <bsd.own.mk>
 
-SUBDIR=         libevent
+SUBDIR=         libevent .WAIT
 .if ${MKCRYPTO} != "no"
 SUBDIR+=       libevent_openssl
 .endif
diff -r 65ee03f9db0e -r ee1bf65c1454 external/bsd/libevent/lib/libevent_openssl/Makefile
--- a/external/bsd/libevent/lib/libevent_openssl/Makefile       Wed Sep 11 18:53:54 2013 +0000
+++ b/external/bsd/libevent/lib/libevent_openssl/Makefile       Wed Sep 11 23:04:09 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2013/04/11 16:59:17 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2013/09/11 23:04:10 joerg Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,9 @@
 SRCS= \
 bufferevent_openssl.c
 
-LIBDPLIBS+=     crypto  ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto \
-       crypt  ${NETBSDSRCDIR}/lib/libcrypt
+LIBDPLIBS+= \
+       event   ${.CURDIR}/../libevent \
+       crypto  ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto \
+       ssl     ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libssl