diff options
| author | mrg <mrg@NetBSD.org> | 2023-06-20 00:30:16 +0000 |
|---|---|---|
| committer | mrg <mrg@NetBSD.org> | 2023-06-20 00:30:16 +0000 |
| commit | ad410565da4872e7ce7079901f6aefd65e3fe00f (patch) | |
| tree | ef9c86e89bf0a5a2ad18158252eb7e0323582032 /crypto | |
| parent | a623ec070988070ed9285574262106b2b5c1aaa5 (diff) | |
XXX stop gap to fix the builds in a way that doesn't make them useless.
it does build "ui.c" a large number of times into individual places.
in the libraries, they're force to local symbols, and in the binaries
it doesn't really matter.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/external/bsd/heimdal/bin/hxtool/Makefile | 4 | ||||
| -rw-r--r-- | crypto/external/bsd/heimdal/bin/kcc/Makefile | 3 | ||||
| -rw-r--r-- | crypto/external/bsd/heimdal/bin/kdestroy/Makefile | 4 | ||||
| -rw-r--r-- | crypto/external/bsd/heimdal/bin/kgetcred/Makefile | 4 | ||||
| -rw-r--r-- | crypto/external/bsd/heimdal/bin/kinit/Makefile | 9 | ||||
| -rw-r--r-- | crypto/external/bsd/heimdal/lib/libhx509/Makefile | 11 | ||||
| -rw-r--r-- | crypto/external/bsd/heimdal/lib/libkrb5/Makefile | 11 | ||||
| -rw-r--r-- | crypto/external/bsd/heimdal/sbin/hprop/Makefile | 11 | ||||
| -rw-r--r-- | crypto/external/bsd/heimdal/sbin/kcm/Makefile | 12 | ||||
| -rw-r--r-- | crypto/external/bsd/heimdal/sbin/kdc/Makefile | 9 | ||||
| -rw-r--r-- | crypto/external/bsd/heimdal/sbin/kdigest/Makefile | 11 | ||||
| -rw-r--r-- | crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile | 11 |
12 files changed, 86 insertions, 14 deletions
diff --git a/crypto/external/bsd/heimdal/bin/hxtool/Makefile b/crypto/external/bsd/heimdal/bin/hxtool/Makefile index cb9d1b7f187..878e9cc0444 100644 --- a/crypto/external/bsd/heimdal/bin/hxtool/Makefile +++ b/crypto/external/bsd/heimdal/bin/hxtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2023/05/09 22:12:33 christos Exp $ +# $NetBSD: Makefile,v 1.4 2023/06/20 00:30:16 mrg Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -7,6 +7,8 @@ USE_FORT?= yes # cryptographic software .PATH: ${HEIMDIST}/lib/hx509 +CPPFLAGS+=-I${HEIMDIST}/lib + PROG= hxtool HEIMSRCS= hxtool.c hxtool-commands.in diff --git a/crypto/external/bsd/heimdal/bin/kcc/Makefile b/crypto/external/bsd/heimdal/bin/kcc/Makefile index cdfb14fa28b..d745050597f 100644 --- a/crypto/external/bsd/heimdal/bin/kcc/Makefile +++ b/crypto/external/bsd/heimdal/bin/kcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2017/01/28 21:31:43 christos Exp $ +# $NetBSD: Makefile,v 1.4 2023/06/20 00:30:16 mrg Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -21,6 +21,7 @@ SRCS= copy_cred_cache.c \ CPPFLAGS+= -I${DESTDIR}/usr/include/krb5 CPPFLAGS+= -I${HEIMDIST}/kuser +CPPFLAGS+= -I${HEIMDIST}/lib LDADD+= -lkafs -lsl LDADD+= -ledit -lterminfo diff --git a/crypto/external/bsd/heimdal/bin/kdestroy/Makefile b/crypto/external/bsd/heimdal/bin/kdestroy/Makefile index 5e936dc192c..e7133cc38e3 100644 --- a/crypto/external/bsd/heimdal/bin/kdestroy/Makefile +++ b/crypto/external/bsd/heimdal/bin/kdestroy/Makefile @@ -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 00:30:16 mrg Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -13,5 +13,7 @@ SRCS= kdestroy.c LDADD+= -lkafs -lsl -lheimntlm DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM} +CPPFLAGS+= -I${HEIMDIST}/lib + .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> diff --git a/crypto/external/bsd/heimdal/bin/kgetcred/Makefile b/crypto/external/bsd/heimdal/bin/kgetcred/Makefile index 74cb2557e01..7e1395597a4 100644 --- a/crypto/external/bsd/heimdal/bin/kgetcred/Makefile +++ b/crypto/external/bsd/heimdal/bin/kgetcred/Makefile @@ -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 00:30:16 mrg Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -13,5 +13,7 @@ SRCS= kgetcred.c LDADD+= -lkafs -lsl -lheimntlm DPADD+= ${LIBKAFS} ${LIBSL} ${LIBHEIMNTLM} +CPPFLAGS+= -I${HEIMDIST}/lib + .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> diff --git a/crypto/external/bsd/heimdal/bin/kinit/Makefile b/crypto/external/bsd/heimdal/bin/kinit/Makefile index 37a27de22cf..8436c5c1b57 100644 --- a/crypto/external/bsd/heimdal/bin/kinit/Makefile +++ b/crypto/external/bsd/heimdal/bin/kinit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:17 he Exp $ +# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:16 mrg Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -11,9 +11,16 @@ 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 + .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> diff --git a/crypto/external/bsd/heimdal/lib/libhx509/Makefile b/crypto/external/bsd/heimdal/lib/libhx509/Makefile index 54224ccfac0..713f8bc5df8 100644 --- a/crypto/external/bsd/heimdal/lib/libhx509/Makefile +++ b/crypto/external/bsd/heimdal/lib/libhx509/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2023/06/19 23:56:55 mrg Exp $ +# $NetBSD: Makefile,v 1.10 2023/06/20 00:30:16 mrg Exp $ NOLINT= # defined @@ -91,5 +91,14 @@ COPTS.crypto-ec.c += -Wno-error=deprecated-declarations COPTS.crypto.c += -Wno-error=deprecated-declarations COPTS.ks_p11.c += -Wno-error=deprecated-declarations +# XXX: Pull this in from hcrypto. Be sure to be last! This subdir +# XXX: also has a "doxygen.c" in it, but the .PATH ordering ensures +# XXX: that the lib/hx509 version is used here, not the lib/hcrypto +# XXX: version. +SRCS+= ui.c +.PATH: ${HEIMDIST}/lib/hcrypto +CPPFLAGS.ui.c+= \ + -I${HEIMDIST}/lib/hcrypto + .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.lib.mk> diff --git a/crypto/external/bsd/heimdal/lib/libkrb5/Makefile b/crypto/external/bsd/heimdal/lib/libkrb5/Makefile index de31439834a..6b9c38e5cdd 100644 --- a/crypto/external/bsd/heimdal/lib/libkrb5/Makefile +++ b/crypto/external/bsd/heimdal/lib/libkrb5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2023/06/19 23:56:56 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2023/06/20 00:30:17 mrg Exp $ USE_FORT?= yes # network protocol library @@ -560,6 +560,15 @@ COPTS.salt-des.c+= -Wno-error=deprecated-declarations COPTS.salt-des3.c+= -Wno-error=deprecated-declarations COPTS.sp800-108-kdf.c+= -Wno-error=deprecated-declarations +# XXX: Pull this in from hcrypto. Be sure to be last! This subdir +# XXX: also has a "doxygen.c" in it, but the .PATH ordering ensures +# XXX: that the lib/krb5 version is used here, not the lib/hcrypto +# XXX: version. +SRCS+= ui.c +.PATH: ${HEIMDIST}/lib/hcrypto +CPPFLAGS.ui.c+= \ + -I${HEIMDIST}/lib/hcrypto + .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.lib.mk> .include <bsd.info.mk> diff --git a/crypto/external/bsd/heimdal/sbin/hprop/Makefile b/crypto/external/bsd/heimdal/sbin/hprop/Makefile index eba6f032ab2..9bb52e5eb7e 100644 --- a/crypto/external/bsd/heimdal/sbin/hprop/Makefile +++ b/crypto/external/bsd/heimdal/sbin/hprop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $ +# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:17 mrg Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -18,10 +18,17 @@ CPPFLAGS+= \ -I${HEIMBASE}/lib/libkrb5 \ -I${HEIMDIST}/lib/asn1 \ -I${HEIMDIST}/lib/hdb \ - -I${HEIMDIST}/lib/krb5 + -I${HEIMDIST}/lib/krb5 \ + -I${HEIMDIST}/lib LDADD+= -lhdb -lutil DPADD+= ${LIBHDB} ${LIBUTIL} +# 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 + .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> diff --git a/crypto/external/bsd/heimdal/sbin/kcm/Makefile b/crypto/external/bsd/heimdal/sbin/kcm/Makefile index 0fa81304c46..1115e473cde 100644 --- a/crypto/external/bsd/heimdal/sbin/kcm/Makefile +++ b/crypto/external/bsd/heimdal/sbin/kcm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $ +# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:17 mrg Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -25,10 +25,18 @@ SRCS= \ renew.c \ sessions.c -CPPFLAGS+= -I${HEIMDIST}/lib/ipc +CPPFLAGS+= \ + -I${HEIMDIST}/lib/ipc \ + -I${HEIMDIST}/lib LDADD+= -lkafs -lheimntlm -lutil DPADD+= ${LIBKAFS} ${LIBHEIMNTLM} ${LIBUTIL} +# 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 + .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> diff --git a/crypto/external/bsd/heimdal/sbin/kdc/Makefile b/crypto/external/bsd/heimdal/sbin/kdc/Makefile index 9cf2e50f7fc..216c4e3af73 100644 --- a/crypto/external/bsd/heimdal/sbin/kdc/Makefile +++ b/crypto/external/bsd/heimdal/sbin/kdc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $ +# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:17 mrg Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -17,11 +17,18 @@ SRCS= connect.c config.c main.c CPPFLAGS+= \ -I${HEIMDIST}/lib/krb5 \ -I${HEIMBASE}/include/krb5 \ + -I${HEIMDIST}/lib LDADD+= -lkdc -lhdb -lheimntlm -lutil DPADD+= ${LIBKDC} ${LIBHDB} ${LIBHEIMNTLM} ${LIBUTIL} MAN= kdc.8 +# 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 + .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> diff --git a/crypto/external/bsd/heimdal/sbin/kdigest/Makefile b/crypto/external/bsd/heimdal/sbin/kdigest/Makefile index 396685d564f..6b562efb98a 100644 --- a/crypto/external/bsd/heimdal/sbin/kdigest/Makefile +++ b/crypto/external/bsd/heimdal/sbin/kdigest/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2014/11/22 01:28:13 pettai Exp $ +# $NetBSD: Makefile,v 1.4 2023/06/20 00:30:17 mrg Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -10,8 +10,17 @@ MAN= kdigest.8 HEIMSRCS+= kdigest.c kdigest-commands.in +CPPFLAGS+= \ + -I${HEIMDIST}/lib + LDADD+= -lheimntlm -lsl -lutil -ledit -lterminfo DPADD+= ${LIBHEIMNTLM} ${LIBSL} ${LIBUTIL} ${LIBEDIT} ${LIBTERMINFO} +# 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 + .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> diff --git a/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile b/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile index 7ee186dbb64..de41a099d3c 100644 --- a/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile +++ b/crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2011/05/25 19:21:19 he Exp $ +# $NetBSD: Makefile,v 1.3 2023/06/20 00:30:17 mrg Exp $ .include <bsd.own.mk> .include <${.CURDIR}/../../Makefile.inc> @@ -9,8 +9,17 @@ PROG= kimpersonate SRCS= kimpersonate.c MAN= kimpersonate.8 +CPPFLAGS+= \ + -I${HEIMDIST}/lib + LDADD+= -lkafs -lheimntlm DPADD+= ${LIBKAFS} ${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 + .include <${HEIMBASE}/Makefile.rules.inc> .include <bsd.prog.mk> |
