Tue Apr 26 08:22:18 2011 UTC ()
The new Heimdal adds -lwind and -lheimbase to the set of libraries,
so define the corresponding LIB* variables.
These are also needed in the PAM_STATIC_* variables, so add them there too.


(he)
diff -r1.264 -r1.265 src/share/mk/bsd.prog.mk
cvs diff -r1.264 -r1.265 src/share/mk/bsd.prog.mk (expand / switch to unified diff)

--- src/share/mk/bsd.prog.mk 2011/04/11 23:03:38 1.264
+++ src/share/mk/bsd.prog.mk 2011/04/26 08:22:17 1.265
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.prog.mk,v 1.264 2011/04/11 23:03:38 joerg Exp $ 1# $NetBSD: bsd.prog.mk,v 1.265 2011/04/26 08:22:17 he Exp $
2# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 2# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
3 3
4.ifndef HOSTPROG 4.ifndef HOSTPROG
5 5
6.include <bsd.init.mk> 6.include <bsd.init.mk>
7.include <bsd.shlib.mk> 7.include <bsd.shlib.mk>
8.include <bsd.gcc.mk> 8.include <bsd.gcc.mk>
9 9
10# 10#
11# Definitions and targets shared among all programs built by a single 11# Definitions and targets shared among all programs built by a single
12# Makefile. 12# Makefile.
13# 13#
14 14
@@ -79,56 +79,59 @@ LIBCRT0= ${DESTDIR}/usr/lib/crt0.o @@ -79,56 +79,59 @@ LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
79.endif 79.endif
80 80
81##### Installed system library definitions 81##### Installed system library definitions
82# 82#
83# E.g. 83# E.g.
84# LIBC?=${DESTDIR}/usr/lib/libc.a 84# LIBC?=${DESTDIR}/usr/lib/libc.a
85# LIBX11?=${DESTDIR}/usr/X11R7/lib/libX11.a 85# LIBX11?=${DESTDIR}/usr/X11R7/lib/libX11.a
86# etc.. 86# etc..
87 87
88.for _lib in \ 88.for _lib in \
89 archive asn1 bluetooth bsdmalloc bz2 c c_pic cdk com_err compat \ 89 archive asn1 bluetooth bsdmalloc bz2 c c_pic cdk com_err compat \
90 crypt crypto crypto_idea crypto_mdc2 crypto_rc5 \ 90 crypt crypto crypto_idea crypto_mdc2 crypto_rc5 \
91 curses dbm des edit event \ 91 curses dbm des edit event \
92 fetch form fl g2c gcc gnumalloc gssapi hdb heimntlm hx509 intl ipsec \ 92 fetch form fl g2c gcc gnumalloc gssapi hdb heimbase heimntlm hx509 \
 93 intl ipsec \
93 kadm5clnt kadm5srv kafs krb5 kvm l lber ldap ldap_r lua \ 94 kadm5clnt kadm5srv kafs krb5 kvm l lber ldap ldap_r lua \
94 m magic menu objc ossaudio pam pcap pci pmc posix pthread pthread_dbg \ 95 m magic menu objc ossaudio pam pcap pci pmc posix pthread pthread_dbg \
95 puffs radius resolv rmt roken rpcsvc rt rump rumpuser saslc skey sl ss \ 96 puffs radius resolv rmt roken rpcsvc rt rump rumpuser saslc skey sl ss \
96 ssh ssl termcap usbhid util wrap y z bind9 dns lwres isccfg isccc isc \ 97 ssh ssl termcap usbhid util wrap y z bind9 dns lwres isccfg isccc isc \
97 \ 98 \
98 rumpfs_cd9660fs rumpfs_efs rumpfs_ext2fs rumpfs_ffs rumpfs_hfs \ 99 rumpfs_cd9660fs rumpfs_efs rumpfs_ext2fs rumpfs_ffs rumpfs_hfs \
99 rumpfs_lfs rumpfs_msdosfs rumpfs_nfs rumpfs_ntfs rumpfs_syspuffs \ 100 rumpfs_lfs rumpfs_msdosfs rumpfs_nfs rumpfs_ntfs rumpfs_syspuffs \
100 rumpfs_tmpfs rumpfs_udf rumpfs_ufs 101 rumpfs_tmpfs rumpfs_udf rumpfs_ufs \
 102 wind
101.ifndef LIB${_lib:tu} 103.ifndef LIB${_lib:tu}
102LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib}.a 104LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib}.a
103.MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded 105.MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded
104.endif 106.endif
105.endfor 107.endfor
106# atf-c and atf-c++ are special cases because we cannot use [-+] as part of 108# atf-c and atf-c++ are special cases because we cannot use [-+] as part of
107# make(1) variable names. Just define them here. 109# make(1) variable names. Just define them here.
108LIBATF_C= ${DESTDIR}/usr/lib/libatf-c.a 110LIBATF_C= ${DESTDIR}/usr/lib/libatf-c.a
109LIBATF_CXX= ${DESTDIR}/usr/lib/libatf-c++.a 111LIBATF_CXX= ${DESTDIR}/usr/lib/libatf-c++.a
110.MADE: ${LIBATF_C} ${LIBATF_CXX} 112.MADE: ${LIBATF_C} ${LIBATF_CXX}
111 113
112# PAM applications, if linked statically, need more libraries 114# PAM applications, if linked statically, need more libraries
113.if (${MKPIC} == "no") 115.if (${MKPIC} == "no")
114.if (${MKCRYPTO} != "no") 116.if (${MKCRYPTO} != "no")
115PAM_STATIC_LDADD+= -lssh 117PAM_STATIC_LDADD+= -lssh
116PAM_STATIC_DPADD+= ${LIBSSH} 118PAM_STATIC_DPADD+= ${LIBSSH}
117.endif 119.endif
118.if (${MKKERBEROS} != "no") 120.if (${MKKERBEROS} != "no")
119PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypto 121PAM_STATIC_LDADD+= -lkafs -lkrb5 -lhx509 -lwind -lasn1 \
120PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} \ 122 -lroken -lcom_err -lheimbase -lcrypto
121 ${LIBCOM_ERR} ${LIBCRYPTO} 123PAM_STATIC_DPADD+= ${LIBKAFS} ${LIBKRB5} ${LIBHX509} ${LIBWIND} ${LIBASN1} \
 124 ${LIBROKEN} ${LIBCOM_ERR} ${LIBHEIMBASE} ${LIBCRYPTO}
122.endif 125.endif
123.if (${MKSKEY} != "no") 126.if (${MKSKEY} != "no")
124PAM_STATIC_LDADD+= -lskey 127PAM_STATIC_LDADD+= -lskey
125PAM_STATIC_DPADD+= ${LIBSKEY} 128PAM_STATIC_DPADD+= ${LIBSKEY}
126.endif 129.endif
127PAM_STATIC_LDADD+= -lradius -lcrypt -lrpcsvc -lutil 130PAM_STATIC_LDADD+= -lradius -lcrypt -lrpcsvc -lutil
128PAM_STATIC_DPADD+= ${LIBRADIUS} ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL} 131PAM_STATIC_DPADD+= ${LIBRADIUS} ${LIBCRYPT} ${LIBRPCSVC} ${LIBUTIL}
129.else 132.else
130PAM_STATIC_LDADD= 133PAM_STATIC_LDADD=
131PAM_STATIC_DPADD= 134PAM_STATIC_DPADD=
132.endif 135.endif
133 136
134# These need + -> X transformations 137# These need + -> X transformations