Mon Jan 30 02:38:51 2017 UTC ()
Fix host tools build for asn1_compile, compile_et, and slc.


(jakllsch)
diff -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile
diff -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile
diff -r1.7 -r1.8 src/tools/asn1_compile/Makefile
diff -r1.9 -r1.10 src/tools/compile_et/Makefile
cvs diff -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile 2011/08/28 10:28:35 1.3
+++ src/crypto/external/bsd/heimdal/lib/libcom_err/compile_et/Makefile 2017/01/30 02:38:50 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2011/08/28 10:28:35 elric Exp $ 1# $NetBSD: Makefile,v 1.4 2017/01/30 02:38:50 jakllsch Exp $
2 2
3NOMAN= # defined 3NOMAN= # defined
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6.include <${.CURDIR}/../../../Makefile.inc> 6.include <${.CURDIR}/../../../Makefile.inc>
7 7
8.PATH: ${HEIMDIST}/lib/com_err \ 8.PATH: ${HEIMDIST}/lib/com_err \
9 ${HEIMDIST}/lib/roken \ 9 ${HEIMDIST}/lib/roken \
10 ${HEIMDIST}/lib/vers 10 ${HEIMDIST}/lib/vers
11 11
12PROG= compile_et 12PROG= compile_et
13 13
14SRCS+= compile_et.c parse.y lex.l \ 14SRCS+= compile_et.c parse.y lex.l \
@@ -40,22 +40,23 @@ DPSRCS= print_version.h @@ -40,22 +40,23 @@ DPSRCS= print_version.h
40make-print-version.lo: ${HEIMBASE}/include/version.h 40make-print-version.lo: ${HEIMBASE}/include/version.h
41 41
42make-print-version: make-print-version.lo 42make-print-version: make-print-version.lo
43 ${HOST_CC} ${HOST_LDFLAGS} -o ${.TARGET} ${.ALLSRC} 43 ${HOST_CC} ${HOST_LDFLAGS} -o ${.TARGET} ${.ALLSRC}
44 44
45print_version.h: make-print-version 45print_version.h: make-print-version
46 ./make-print-version print_version.h 46 ./make-print-version print_version.h
47 47
48CLEANFILES+= print_version.h make-print-version make-print-version.lo 48CLEANFILES+= print_version.h make-print-version make-print-version.lo
49 49
50beforedepend: 50beforedepend:
51 [ -h krb5 ] || ln -sf . krb5 51 [ -h krb5 ] || ln -sf . krb5
52 ln -sf ${HEIMBASE}/include/roken.h 52 ln -sf ${HEIMBASE}/include/roken.h
 53 ln -sf ${HEIMBASE}/include/krb5-types.h
53 ln -sf ${HEIMBASE}/dist/lib/roken/roken-common.h 54 ln -sf ${HEIMBASE}/dist/lib/roken/roken-common.h
54 ln -sf ${HEIMBASE}/dist/lib/roken/getarg.h 55 ln -sf ${HEIMBASE}/dist/lib/roken/getarg.h
55 56
56CLEANFILES+= krb5 roken.h roken-common.h getarg.h 57CLEANFILES+= krb5 roken.h krb5-types.h roken-common.h getarg.h
57 58
58.ifndef HOSTPROG 59.ifndef HOSTPROG
59HOSTPROG= ${PROG} 60HOSTPROG= ${PROG}
60.include <bsd.hostprog.mk> 61.include <bsd.hostprog.mk>
61.endif 62.endif
cvs diff -r1.3 -r1.4 src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile 2011/04/15 21:02:47 1.3
+++ src/crypto/external/bsd/heimdal/lib/libsl/slc/Makefile 2017/01/30 02:38:50 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.3 2011/04/15 21:02:47 elric Exp $ 1# $NetBSD: Makefile,v 1.4 2017/01/30 02:38:50 jakllsch Exp $
2 2
3NOMAN= # defined 3NOMAN= # defined
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6.include <${.CURDIR}/../../../Makefile.inc> 6.include <${.CURDIR}/../../../Makefile.inc>
7 7
8.PATH: ${HEIMDIST}/lib/sl ${HEIMDIST}/lib/roken ${HEIMDIST}/lib/vers 8.PATH: ${HEIMDIST}/lib/sl ${HEIMDIST}/lib/roken ${HEIMDIST}/lib/vers
9 9
10PROG=slc 10PROG=slc
11 11
12SRCS+= slc-gram.y slc-lex.l getarg.c rand.c get_window_size.c \ 12SRCS+= slc-gram.y slc-lex.l getarg.c rand.c get_window_size.c \
13 strupr.c print_version.c 13 strupr.c print_version.c
14 14
@@ -27,25 +27,26 @@ DPSRCS= print_version.h @@ -27,25 +27,26 @@ DPSRCS= print_version.h
27make-print-version.lo: ${HEIMBASE}/include/version.h 27make-print-version.lo: ${HEIMBASE}/include/version.h
28 28
29make-print-version: make-print-version.lo 29make-print-version: make-print-version.lo
30 ${HOST_CC} ${HOST_LDFLAGS} -o ${.TARGET} ${.ALLSRC} 30 ${HOST_CC} ${HOST_LDFLAGS} -o ${.TARGET} ${.ALLSRC}
31 31
32print_version.h: make-print-version 32print_version.h: make-print-version
33 ./make-print-version print_version.h 33 ./make-print-version print_version.h
34 34
35.NOPATH: print_version.h make-print-version 35.NOPATH: print_version.h make-print-version
36 36
37beforedepend: 37beforedepend:
38 [ -h krb5 ] || ln -sf . krb5 38 [ -h krb5 ] || ln -sf . krb5
39 ln -sf ${HEIMBASE}/include/roken.h 39 ln -sf ${HEIMBASE}/include/roken.h
 40 ln -sf ${HEIMBASE}/include/krb5-types.h
40 ln -sf ${HEIMBASE}/dist/lib/roken/roken-common.h 41 ln -sf ${HEIMBASE}/dist/lib/roken/roken-common.h
41 ln -sf ${HEIMBASE}/dist/lib/roken/getarg.h 42 ln -sf ${HEIMBASE}/dist/lib/roken/getarg.h
42 43
43CLEANFILES+= krb5 roken.h roken-common.h getarg.h \ 44CLEANFILES+= krb5 roken.h krb5-types.h roken-common.h \
44 print_version.h make-print-version \ 45 getarg.h print_version.h make-print-version \
45 make-print-version.lo 46 make-print-version.lo
46 47
47# HOSTPROG will be set already if this is a src/tools build. 48# HOSTPROG will be set already if this is a src/tools build.
48.ifndef HOSTPROG 49.ifndef HOSTPROG
49HOSTPROG= ${PROG} 50HOSTPROG= ${PROG}
50.include <bsd.hostprog.mk> 51.include <bsd.hostprog.mk>
51.endif 52.endif
cvs diff -r1.7 -r1.8 src/tools/asn1_compile/Makefile (expand / switch to unified diff)

--- src/tools/asn1_compile/Makefile 2017/01/29 22:16:51 1.7
+++ src/tools/asn1_compile/Makefile 2017/01/30 02:38:50 1.8
@@ -1,12 +1,6 @@ @@ -1,12 +1,6 @@
1# $NetBSD: Makefile,v 1.7 2017/01/29 22:16:51 christos Exp $ 1# $NetBSD: Makefile,v 1.8 2017/01/30 02:38:50 jakllsch Exp $
2 2
3HOSTPROGNAME= ${_TOOL_PREFIX}asn1_compile 3HOSTPROGNAME= ${_TOOL_PREFIX}asn1_compile
4HOST_SRCDIR= crypto/external/bsd/heimdal/lib/libasn1/asn1_compile 4HOST_SRCDIR= crypto/external/bsd/heimdal/lib/libasn1/asn1_compile
5CPPFLAGS+= -I. 
6 
7.if !make(obj) && !make(clean) && !make(cleandir) 
8.BEGIN: 
9 ln -sf ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/include krb5 
10.endif 
11 5
12.include "${.CURDIR}/../Makefile.host" 6.include "${.CURDIR}/../Makefile.host"
cvs diff -r1.9 -r1.10 src/tools/compile_et/Makefile (expand / switch to unified diff)

--- src/tools/compile_et/Makefile 2017/01/29 22:16:51 1.9
+++ src/tools/compile_et/Makefile 2017/01/30 02:38:50 1.10
@@ -1,12 +1,6 @@ @@ -1,12 +1,6 @@
1# $NetBSD: Makefile,v 1.9 2017/01/29 22:16:51 christos Exp $ 1# $NetBSD: Makefile,v 1.10 2017/01/30 02:38:50 jakllsch Exp $
2 2
3HOSTPROGNAME= ${_TOOL_PREFIX}compile_et 3HOSTPROGNAME= ${_TOOL_PREFIX}compile_et
4HOST_SRCDIR= crypto/external/bsd/heimdal/lib/libcom_err/compile_et 4HOST_SRCDIR= crypto/external/bsd/heimdal/lib/libcom_err/compile_et
5CPPFLAGS+= -I. 
6 
7.if !make(obj) && !make(clean) && !make(cleandir) 
8.BEGIN: 
9 ln -sf ${NETBSDSRCDIR}/crypto/external/bsd/heimdal/include krb5 
10.endif 
11 5
12.include "${.CURDIR}/../Makefile.host" 6.include "${.CURDIR}/../Makefile.host"