Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
mrg 2023-06-20 00:30:16 +00:00
parent a4ccfd02eb
commit 02952e8c1c
12 changed files with 86 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/external/bsd/heimdal/bin/hxtool/Makefile vendored
View File

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

3
crypto/external/bsd/heimdal/bin/kcc/Makefile vendored
View File

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

4
crypto/external/bsd/heimdal/bin/kdestroy/Makefile vendored
View File

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

4
crypto/external/bsd/heimdal/bin/kgetcred/Makefile vendored
View File

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

9
crypto/external/bsd/heimdal/bin/kinit/Makefile vendored
View File

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

11
crypto/external/bsd/heimdal/lib/libhx509/Makefile vendored
View File

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

11
crypto/external/bsd/heimdal/lib/libkrb5/Makefile vendored
View File

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

11
crypto/external/bsd/heimdal/sbin/hprop/Makefile vendored
View File

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

12
crypto/external/bsd/heimdal/sbin/kcm/Makefile vendored
View File

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

9
crypto/external/bsd/heimdal/sbin/kdc/Makefile vendored
View File

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

11
crypto/external/bsd/heimdal/sbin/kdigest/Makefile vendored
View File

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

11
crypto/external/bsd/heimdal/sbin/kimpersonate/Makefile vendored
View File

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