Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/crypto/external/bsd/heimdal Use PROGDPLIBS instead of LDADD/...
details: https://anonhg.NetBSD.org/src/rev/a7c715f50577
branches: trunk
changeset: 376494:a7c715f50577
user: christos <christos%NetBSD.org@localhost>
date: Tue Jun 20 17:23:01 2023 +0000
description:
Use PROGDPLIBS instead of LDADD/DPADD; remove ui.c kludges
diffstat:
crypto/external/bsd/heimdal/Makefile.inc | 29 ++++++++----
crypto/external/bsd/heimdal/bin/Makefile.inc | 8 +--
crypto/external/bsd/heimdal/bin/gsstool/Makefile | 8 +--
crypto/external/bsd/heimdal/bin/hxtool/Makefile | 13 +----
crypto/external/bsd/heimdal/bin/kcc/Makefile | 6 +-
crypto/external/bsd/heimdal/bin/kdestroy/Makefile | 7 +--
crypto/external/bsd/heimdal/bin/kgetcred/Makefile | 7 +--
crypto/external/bsd/heimdal/bin/kinit/Makefile | 14 +----
crypto/external/bsd/heimdal/bin/kpasswd/Makefile | 13 ++---
crypto/external/bsd/heimdal/bin/kvno/Makefile | 11 ++--
crypto/external/bsd/heimdal/bin/string2key/Makefile | 11 ++--
crypto/external/bsd/heimdal/bin/verify_krb5_conf/Makefile | 8 +--
crypto/external/bsd/heimdal/lib/libkrb5/Makefile | 14 +-----
crypto/external/bsd/heimdal/lib/libvers/Makefile | 3 +-
crypto/external/bsd/heimdal/libexec/Makefile.inc | 8 +--
crypto/external/bsd/heimdal/libexec/digest-service/Makefile | 14 +++---
crypto/external/bsd/heimdal/libexec/hpropd/Makefile | 12 ++---
crypto/external/bsd/heimdal/libexec/ipropd-master/Makefile | 13 ++---
crypto/external/bsd/heimdal/libexec/ipropd-slave/Makefile | 12 ++--
crypto/external/bsd/heimdal/libexec/kadmind/Makefile | 19 ++-----
crypto/external/bsd/heimdal/libexec/kpasswdd/Makefile | 11 ++--
crypto/external/bsd/heimdal/sbin/Makefile.inc | 8 +--
crypto/external/bsd/heimdal/sbin/hprop/Makefile | 14 +----
crypto/external/bsd/heimdal/sbin/iprop-log/Makefile | 11 +---
crypto/external/bsd/heimdal/sbin/kadmin/Makefile | 14 ++---
crypto/external/bsd/heimdal/sbin/kcm/Makefile | 16 ++----
crypto/external/bsd/heimdal/sbin/kdc/Makefile | 13 +----
crypto/external/bsd/heimdal/sbin/kdigest/Makefile | 16 +-----
crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile | 14 +-----
crypto/external/bsd/heimdal/sbin/kstash/Makefile | 8 +-
crypto/external/bsd/heimdal/sbin/ktutil/Makefile | 11 ++--
31 files changed, 139 insertions(+), 227 deletions(-)
diffs (truncated from 895 to 300 lines):
diff -r b429c0e5714b -r a7c715f50577 crypto/external/bsd/heimdal/Makefile.inc
--- a/crypto/external/bsd/heimdal/Makefile.inc Tue Jun 20 17:22:01 2023 +0000
+++ b/crypto/external/bsd/heimdal/Makefile.inc Tue Jun 20 17:23:01 2023 +0000
@@ -1,20 +1,27 @@
-# $NetBSD: Makefile.inc,v 1.6 2020/07/23 07:53:35 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.7 2023/06/20 17:23:01 christos Exp $
HEIMBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
HEIMDIST= ${HEIMBASE}/dist
SSLBASE?= ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}
-LIBVERSDIR!= cd ${HEIMBASE}/lib/libvers && ${PRINTOBJDIR}
-LIBVERS= ${LIBVERSDIR}/libvers.a
-
-LIBIPCDIR!= cd ${HEIMBASE}/lib/libipc && ${PRINTOBJDIR}
-LIBIPC= ${LIBIPCDIR}/libipc.a
-.if ${MKPICLIB} != "yes"
-LIBIPC_PIC= ${LIBIPCDIR}/libipc.a
-.else
-LIBIPC_PIC= ${LIBIPCDIR}/libipc_pic.a
-.endif
+DPLIBASN1= asn1 ${HEIMBASE}/lib/libasn1
+DPLIBCOM_ERR= com_err ${HEIMBASE}/lib/libcom_err
+DPLIBGSSAPI= gssapi ${HEIMBASE}/lib/libgssapi
+DPLIBHDB= hdb ${HEIMBASE}/lib/libhdb
+DPLIBHEIMBASE= heimbase ${HEIMBASE}/lib/libheimbase
+DPLIBHEIMNTLM= heimntlm ${HEIMBASE}/lib/libheimntlm
+DPLIBHX509= hx509 ${HEIMBASE}/lib/libhx509
+DPLIBIPC= ipc ${HEIMBASE}/lib/libipc
+DPLIBKADM5CLNT= kadm5clnt ${HEIMBASE}/lib/libkadm5clnt
+DPLIBKADM5SRV= kadm5srv ${HEIMBASE}/lib/libkadm5srv
+DPLIBKAFS= kafs ${HEIMBASE}/lib/libkafs
+DPLIBKDC= kdc ${HEIMBASE}/lib/libkdc
+DPLIBKRB5= krb5 ${HEIMBASE}/lib/libkrb5
+DPLIBROKEN= roken ${HEIMBASE}/lib/libroken
+DPLIBSL= sl ${HEIMBASE}/lib/libsl
+DPLIBVERS= vers ${HEIMBASE}/lib/libvers
+DPLIBWIND= wind ${HEIMBASE}/lib/libwind
.if ${USETOOLS} != "yes"
COMPILEETOBJ!= cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
diff -r b429c0e5714b -r a7c715f50577 crypto/external/bsd/heimdal/bin/Makefile.inc
--- a/crypto/external/bsd/heimdal/bin/Makefile.inc Tue Jun 20 17:22:01 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/Makefile.inc Tue Jun 20 17:23:01 2023 +0000
@@ -1,9 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.4 2018/02/25 00:16:48 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2023/06/20 17:23:01 christos Exp $
BINDIR=/usr/bin
-LDADD+= ${LIBKRB5_LDADD}
-DPADD+= ${LIBKRB5_DPADD}
-
-LDADD+= -lheimbase ${LIBVERS}
-DPADD+= ${LIBHEIMBASE} ${LIBVERS}
+PROGDPLIBS += ${DPLIBKRB5} ${DPLIBHEIMBASE} ${DPLIBROKEN} ${DPLIBVERS}
diff -r b429c0e5714b -r a7c715f50577 crypto/external/bsd/heimdal/bin/gsstool/Makefile
--- a/crypto/external/bsd/heimdal/bin/gsstool/Makefile Tue Jun 20 17:22:01 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/gsstool/Makefile Tue Jun 20 17:23:01 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:16 he Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/20 17:23:01 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -13,11 +13,9 @@ HEIMSRCS= gsstool.c gss-commands.in
MAN=
-LDADD+= -lgssapi -lheimntlm
-LDADD+= -lsl ${LIBVERS}
+PROGDPLIBS += ${DPLIBGSSAPI} ${DPLIBSL}
+
LDADD+= -ledit -lterminfo
-DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM}
-DPADD+= ${LIBSL}
DPADD+= ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
diff -r b429c0e5714b -r a7c715f50577 crypto/external/bsd/heimdal/bin/hxtool/Makefile
--- a/crypto/external/bsd/heimdal/bin/hxtool/Makefile Tue Jun 20 17:22:01 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/hxtool/Makefile Tue Jun 20 17:23:01 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 00:30:16 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:01 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -7,20 +7,15 @@ USE_FORT?= yes # cryptographic software
.PATH: ${HEIMDIST}/lib/hx509
-CPPFLAGS+=-I${HEIMDIST}/lib
-
PROG= hxtool
HEIMSRCS= hxtool.c hxtool-commands.in
MAN=
-LDADD+= -lgssapi
-LDADD+= -lsl
-LDADD+= -ledit -lterminfo
-DPADD+= ${LIBGSSAPI}
-DPADD+= ${LIBSL}
-DPADD+= ${LIBEDIT} ${LIBTERMINFO}
+PROGDPLIBS+= ${DPLIBASN1} ${DPLIBGSSAPI} ${DPLIBHX509} ${DPLIBSL}
+LDADD+= -lcrypto -ledit -lterminfo
+DPADD+= ${LIBCRYPTO} ${LIBEDIT} ${LIBTERMINFO}
COPTS.hxtool.c+= -Wno-error=deprecated-declarations
diff -r b429c0e5714b -r a7c715f50577 crypto/external/bsd/heimdal/bin/kcc/Makefile
--- a/crypto/external/bsd/heimdal/bin/kcc/Makefile Tue Jun 20 17:22:01 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/kcc/Makefile Tue Jun 20 17:23:01 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/06/20 00:30:16 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2023/06/20 17:23:01 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -21,11 +21,9 @@ SRCS= copy_cred_cache.c \
CPPFLAGS+= -I${DESTDIR}/usr/include/krb5
CPPFLAGS+= -I${HEIMDIST}/kuser
-CPPFLAGS+= -I${HEIMDIST}/lib
-LDADD+= -lkafs -lsl
+PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKAFS} ${DPLIBSL}
LDADD+= -ledit -lterminfo
-DPADD+= ${LIBKAFS} ${LIBSL}
DPADD+= ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
diff -r b429c0e5714b -r a7c715f50577 crypto/external/bsd/heimdal/bin/kdestroy/Makefile
--- a/crypto/external/bsd/heimdal/bin/kdestroy/Makefile Tue Jun 20 17:22:01 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/kdestroy/Makefile Tue Jun 20 17:23:01 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:16 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -10,10 +10,7 @@ USE_FORT?= yes # cryptographic software
PROG= kdestroy
SRCS= kdestroy.c
-LDADD+= -lkafs -lsl -lheimntlm
-DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
-
-CPPFLAGS+= -I${HEIMDIST}/lib
+PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBSL} ${DPLIBHEIMNTLM}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
diff -r b429c0e5714b -r a7c715f50577 crypto/external/bsd/heimdal/bin/kgetcred/Makefile
--- a/crypto/external/bsd/heimdal/bin/kgetcred/Makefile Tue Jun 20 17:22:01 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/kgetcred/Makefile Tue Jun 20 17:23:01 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:16 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -10,10 +10,7 @@ USE_FORT?= yes # cryptographic software
PROG= kgetcred
SRCS= kgetcred.c
-LDADD+= -lkafs -lsl -lheimntlm
-DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
-
-CPPFLAGS+= -I${HEIMDIST}/lib
+PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKAFS} ${DPLIBSL} ${DPLIBHEIMNTLM}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
diff -r b429c0e5714b -r a7c715f50577 crypto/external/bsd/heimdal/bin/kinit/Makefile
--- a/crypto/external/bsd/heimdal/bin/kinit/Makefile Tue Jun 20 17:22:01 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/kinit/Makefile Tue Jun 20 17:23:01 2023 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:16 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
@@ -11,16 +11,10 @@ PROG= kinit
SRCS= kinit.c
CPPFLAGS+= -I${HEIMDIST}/lib/ntlm
-CPPFLAGS+= -I${HEIMDIST}/lib
-LDADD+= -lkafs -lsl -lheimntlm
-DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
-
-# XXX: Pull this in from hcrypto. Be sure to be last!
-SRCS+= ui.c
-.PATH: ${HEIMDIST}/lib/hcrypto
-CPPFLAGS.ui.c+= \
- -I${HEIMDIST}/lib/hcrypto
+PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBSL} ${DPLIBHEIMNTLM}
+LDADD+= -lcrypto
+DPSDD+= ${LIBCRYPTO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
diff -r b429c0e5714b -r a7c715f50577 crypto/external/bsd/heimdal/bin/kpasswd/Makefile
--- a/crypto/external/bsd/heimdal/bin/kpasswd/Makefile Tue Jun 20 17:22:01 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/kpasswd/Makefile Tue Jun 20 17:23:01 2023 +0000
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:43 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
USE_FORT?= yes # cryptographic software
-.PATH: ${HEIMDIST}/kpasswd ${HEIMDIST}/lib/hcrypto
-
-CPPFLAGS+=-I${HEIMDIST}/lib
+.PATH: ${HEIMDIST}/kpasswd
PROG= kpasswd
-SRCS= kpasswd.c ui.c
+SRCS= kpasswd.c
-LDADD+= -lkafs -lsl -lheimntlm
-DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM}
+PROGDPLIBS+= ${DPLIBKAFS} ${DPLIBSL} ${DPLIBHEIMNTLM}
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
.include <${HEIMBASE}/Makefile.rules.inc>
.include <bsd.prog.mk>
diff -r b429c0e5714b -r a7c715f50577 crypto/external/bsd/heimdal/bin/kvno/Makefile
--- a/crypto/external/bsd/heimdal/bin/kvno/Makefile Tue Jun 20 17:22:01 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/kvno/Makefile Tue Jun 20 17:23:01 2023 +0000
@@ -1,26 +1,25 @@
-# $NetBSD: Makefile,v 1.2 2023/06/19 23:11:43 christos Exp $
+# $NetBSD: Makefile,v 1.3 2023/06/20 17:23:02 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
USE_FORT?= yes # cryptographic software
-.PATH: ${HEIMDIST}/kuser ${HEIMDIST}/lib/hcrypto
+.PATH: ${HEIMDIST}/kuser
PROG= kvno
#HEIMSRCS= kcc-commands.in
-SRCS= kvno.c ui.c
+SRCS= kvno.c
MAN= kvno.1
-CPPFLAGS+= -I${DESTDIR}/usr/include/krb5 -I${HEIMDIST}/lib
+CPPFLAGS+= -I${DESTDIR}/usr/include/krb5
COPTS.kvno.c+= -Wno-deprecated-declarations
-LDADD+= -lkafs -lsl
+PROGDPLIBS+= ${DPLIBASN1} ${DPLIBKAFS} ${DPLIBSL}
LDADD+= -ledit -lterminfo
-DPADD+= ${LIBKAFS} ${LIBSL}
DPADD+= ${LIBEDIT} ${LIBTERMINFO}
.include <${HEIMBASE}/Makefile.rules.inc>
diff -r b429c0e5714b -r a7c715f50577 crypto/external/bsd/heimdal/bin/string2key/Makefile
--- a/crypto/external/bsd/heimdal/bin/string2key/Makefile Tue Jun 20 17:22:01 2023 +0000
+++ b/crypto/external/bsd/heimdal/bin/string2key/Makefile Tue Jun 20 17:23:01 2023 +0000
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2023/06/19 23:11:44 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/06/20 17:23:02 christos Exp $
.include <bsd.own.mk>
.include <${.CURDIR}/../../Makefile.inc>
USE_FORT?= yes # cryptographic software
-.PATH: ${HEIMDIST}/kdc ${HEIMDIST}/lib/hcrypto
-
-CPPFLAGS+=-I${HEIMDIST}/lib
+.PATH: ${HEIMDIST}/kdc
PROG= string2key
-SRCS= string2key.c ui.c
+SRCS= string2key.c
MAN= string2key.8
CPPFLAGS+= \
@@ -22,5 +20,8 @@ CPPFLAGS+= \
-I${HEIMBASE}/lib/libheimntlm \
-I${HEIMBASE}/lib/libwind \
+LDADD+=-lcrypto
+DPADD+=${LIBCRYPTO}
+
Home |
Main Index |
Thread Index |
Old Index