[src/trunk]: src/lib Prep Heimdal host tools for new toolchain.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/lib Prep Heimdal host tools for new toolchain.
From: tv <tv%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 09:46:29 +0000
details:   https://anonhg.NetBSD.org/src/rev/5c783700d91f
branches:  trunk
changeset: 515298:5c783700d91f
user:      tv <tv%NetBSD.org@localhost>
date:      Fri Sep 21 22:58:59 2001 +0000

description:
Prep Heimdal host tools for new toolchain.

diffstat:

 lib/libasn1/Makefile                   |   9 +++-
 lib/libasn1/asn1_compile/Makefile      |  21 ++++-------
 lib/libasn1/asn1_compile/nb_progname.c |  58 ++++++++++++++++++++++++++++++++++
 lib/libcom_err/Makefile                |   8 ++++-
 lib/libhdb/Makefile                    |   9 +++-
 lib/libkadm/Makefile                   |   9 +++-
 lib/libkadm5clnt/Makefile              |   9 +++-
 lib/libkrb/Makefile                    |   9 +++-
 lib/libkrb5/Makefile                   |  13 ++++--
 9 files changed, 111 insertions(+), 34 deletions(-)

diffs (truncated from 304 to 300 lines):

diff -r 674226b7bcdc -r 5c783700d91f lib/libasn1/Makefile
--- a/lib/libasn1/Makefile      Fri Sep 21 22:47:37 2001 +0000
+++ b/lib/libasn1/Makefile      Fri Sep 21 22:58:59 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/06/20 02:01:18 assar Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/21 22:58:59 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -10,10 +10,13 @@
 
 LIB=   asn1
 
-COMPILEET!=    cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+.ifndef USE_NEW_TOOLCHAIN
+COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+COMPILE_ET=    ${COMPILEETOBJ}/compile_et
+.endif
 
 asn1_err.h asn1_err.c: asn1_err.et
-       ${COMPILEET}/compile_et ${DIST}/heimdal/lib/asn1/asn1_err.et
+       ${COMPILE_ET} ${DIST}/heimdal/lib/asn1/asn1_err.et
 
 DPSRCS=        asn1_err.h
 
diff -r 674226b7bcdc -r 5c783700d91f lib/libasn1/asn1_compile/Makefile
--- a/lib/libasn1/asn1_compile/Makefile Fri Sep 21 22:47:37 2001 +0000
+++ b/lib/libasn1/asn1_compile/Makefile Fri Sep 21 22:58:59 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/09/17 12:34:41 assar Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/21 22:58:59 tv Exp $
 
 NOMAN= noman
 
@@ -34,31 +34,26 @@
        get_window_size.c
 
 SRCS=  $(asn1_compile_SRCS)                    \
-       $(roken_SRCS)
+       $(roken_SRCS)                           \
+       nb_progname.c
 
 YHEADER=       1
 
-BINDIR=        /usr/bin
-
-LIBROKEN!=     cd ${.CURDIR}/../../libroken && ${PRINTOBJDIR}
+#LIBROKEN!=    cd ${.CURDIR}/../../libroken && ${PRINTOBJDIR}
+#       -I${LIBROKEN}                          \
 
 HOST_CPPFLAGS+= -I.                            \
         -I${.CURDIR}/../../../include/heimdal  \
-        -I${LIBROKEN}                          \
         -I${DIST}/heimdal/lib/asn1             \
         -I${DIST}/heimdal/lib/roken            \
         -DHAVE_CONFIG_H
 
 DPSRCS=        print_version.h
 
-make-print-version.lo: ${.CURDIR}/../../../include/heimdal/version.h
-
-make-print-version: make-print-version.lo
-       ${HOST_CC} ${HOST_LDFLAGS} -o ${.TARGET} ${.ALLSRC}
-
-print_version.h: make-print-version
+print_version.h: make-print-version.c ${.CURDIR}/../../../include/heimdal/version.h
+       ${HOST_LINK.c} -o make-print-version ${>:M*.c}
        ./make-print-version print_version.h
 
-CLEANFILES+=   print_version.h make-print-version make-print-version.lo
+CLEANFILES+=   print_version.h make-print-version
 
 .include <bsd.hostprog.mk>
diff -r 674226b7bcdc -r 5c783700d91f lib/libasn1/asn1_compile/nb_progname.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/libasn1/asn1_compile/nb_progname.c    Fri Sep 21 22:58:59 2001 +0000
@@ -0,0 +1,58 @@
+/*     $NetBSD: nb_progname.c,v 1.1 2001/09/21 22:59:00 tv Exp $       */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Todd Vierling.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Stub to emulate [gs]etprogname() where needed. */
+
+#ifdef __NetBSD__
+#include <sys/param.h>
+#if !defined(__NetBSD_Version__) || (__NetBSD_Version__ < 106000000)
+#undef __NetBSD__
+#endif
+#endif
+
+#ifndef __NetBSD__
+const char *ln_progname;
+
+void setprogname(const char *progname) {
+       ln_progname = progname;
+}
+
+const char *getprogname(void) {
+       return ln_progname;
+}
+#endif
diff -r 674226b7bcdc -r 5c783700d91f lib/libcom_err/Makefile
--- a/lib/libcom_err/Makefile   Fri Sep 21 22:47:37 2001 +0000
+++ b/lib/libcom_err/Makefile   Fri Sep 21 22:58:59 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/11/13 15:05:30 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/21 22:59:00 tv Exp $
 DIST=          ${.CURDIR}/../../crypto/dist
 .PATH: ${DIST}/heimdal/lib/com_err
 
@@ -10,12 +10,14 @@
 
 INCS=  com_err.h com_right.h
 
+.ifndef USE_NEW_TOOLCHAIN
 .PHONY: compile_et
 
 includes: compile_et
 
 compile_et:
        @cd ${.CURDIR}/compile_et && ${MAKE}
+.endif
 
 INCSDIR=/usr/include/krb5
 
@@ -26,7 +28,11 @@
         -I${DIST}/heimdal/lib/roken            \
         -DHAVE_CONFIG_H
 
+.ifndef USE_NEW_TOOLCHAIN
 SUBDIR=        compile_et
+.endif
 
 .include <bsd.lib.mk>
+.ifndef USE_NEW_TOOLCHAIN
 .include <bsd.subdir.mk>
+.endif
diff -r 674226b7bcdc -r 5c783700d91f lib/libhdb/Makefile
--- a/lib/libhdb/Makefile       Fri Sep 21 22:47:37 2001 +0000
+++ b/lib/libhdb/Makefile       Fri Sep 21 22:58:59 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/09/17 12:34:41 assar Exp $
+# $NetBSD: Makefile,v 1.8 2001/09/21 22:59:00 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -10,10 +10,13 @@
 
 LIB=   hdb
 
-COMPILEET!=    cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+.ifndef USE_NEW_TOOLCHAIN
+COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+COMPILE_ET=    ${COMPILEETOBJ}/compile_et
+.endif
 
 hdb_err.c hdb_err.h: hdb_err.et
-       ${COMPILEET}/compile_et ${DIST}/heimdal/lib/hdb/hdb_err.et
+       ${COMPILE_ET} ${DIST}/heimdal/lib/hdb/hdb_err.et
 
 ERR_FILES = hdb_err.c
 
diff -r 674226b7bcdc -r 5c783700d91f lib/libkadm/Makefile
--- a/lib/libkadm/Makefile      Fri Sep 21 22:47:37 2001 +0000
+++ b/lib/libkadm/Makefile      Fri Sep 21 22:58:59 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/12/30 17:21:44 sommerfeld Exp $
+# $NetBSD: Makefile,v 1.5 2001/09/21 22:59:01 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -10,10 +10,13 @@
 
 LIB=   kadm
 
-COMPILEET!=    cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+.ifndef USE_NEW_TOOLCHAIN
+COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+COMPILE_ET=    ${COMPILEETOBJ}/compile_et
+.endif
 
 kadm_err.c kadm_err.h: kadm_err.et
-       ${COMPILEET}/compile_et ${DIST}/krb4/lib/kadm/kadm_err.et
+       ${COMPILE_ET} ${DIST}/krb4/lib/kadm/kadm_err.et
 
 ERR_FILES=     kadm_err.c
 
diff -r 674226b7bcdc -r 5c783700d91f lib/libkadm5clnt/Makefile
--- a/lib/libkadm5clnt/Makefile Fri Sep 21 22:47:37 2001 +0000
+++ b/lib/libkadm5clnt/Makefile Fri Sep 21 22:58:59 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/09/17 12:34:42 assar Exp $
+# $NetBSD: Makefile,v 1.10 2001/09/21 22:59:01 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -10,10 +10,13 @@
 
 LIB=   kadm5clnt
 
-COMPILEET!=    cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+.ifndef USE_NEW_TOOLCHAIN
+COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+COMPILE_ET=    ${COMPILEETOBJ}/compile_et
+.endif
 
 kadm5_err.c kadm5_err.h: kadm5_err.et
-       ${COMPILEET}/compile_et ${DIST}/heimdal/lib/kadm5/kadm5_err.et
+       ${COMPILE_ET} ${DIST}/heimdal/lib/kadm5/kadm5_err.et
 
 ERR_FILES = kadm5_err.c
 
diff -r 674226b7bcdc -r 5c783700d91f lib/libkrb/Makefile
--- a/lib/libkrb/Makefile       Fri Sep 21 22:47:37 2001 +0000
+++ b/lib/libkrb/Makefile       Fri Sep 21 22:58:59 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/09/17 12:34:42 assar Exp $
+# $NetBSD: Makefile,v 1.11 2001/09/21 22:59:01 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -25,10 +25,13 @@
 
 LIB=   krb
 
-COMPILEET!=    cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+.ifndef USE_NEW_TOOLCHAIN
+COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+COMPILE_ET=    ${COMPILEETOBJ}/compile_et
+.endif
 
 krb_err.c krb_err.h: krb_err.et
-       ${COMPILEET}/compile_et ${DIST}/krb4/lib/krb/krb_err.et
+       ${COMPILE_ET} ${DIST}/krb4/lib/krb/krb_err.et
 
 ERR_FILES=     krb_err.c
 
diff -r 674226b7bcdc -r 5c783700d91f lib/libkrb5/Makefile
--- a/lib/libkrb5/Makefile      Fri Sep 21 22:47:37 2001 +0000
+++ b/lib/libkrb5/Makefile      Fri Sep 21 22:58:59 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/09/17 12:34:43 assar Exp $
+# $NetBSD: Makefile,v 1.14 2001/09/21 22:59:01 tv Exp $
 
 .include <bsd.own.mk>
 
@@ -11,16 +11,19 @@
 
 LIB=   krb5
 
-COMPILEET!=    cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+.ifndef USE_NEW_TOOLCHAIN
+COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+COMPILE_ET=    ${COMPILEETOBJ}/compile_et
+.endif
 
 krb5_err.c krb5_err.h: krb5_err.et
-       ${COMPILEET}/compile_et ${DIST}/heimdal/lib/krb5/krb5_err.et
+       ${COMPILE_ET} ${DIST}/heimdal/lib/krb5/krb5_err.et
 
 heim_err.c heim_err.h: heim_err.et
-       ${COMPILEET}/compile_et ${DIST}/heimdal/lib/krb5/heim_err.et
+       ${COMPILE_ET} ${DIST}/heimdal/lib/krb5/heim_err.et
 
 k524_err.c k524_err.h: k524_err.et
-       ${COMPILEET}/compile_et ${DIST}/heimdal/lib/krb5/k524_err.et
Prev by Date: [src/trunk]: src/share/mk The -m option is automatically propagated by make(1...
Next by Date: [src/trunk]: src/lib/libc/locale fix type in comment
Previous by Thread: [src/trunk]: src/share/mk The -m option is automatically propagated by make(1...
Next by Thread: [src/trunk]: src/lib/libc/locale fix type in comment
Indexes:
Home | Main Index | Thread Index | Old Index