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 move $VERSION from Makefile.inc ...



details:   https://anonhg.NetBSD.org/src/rev/27ebd84c6c7c
branches:  trunk
changeset: 936254:27ebd84c6c7c
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Jul 23 07:53:35 2020 +0000

description:
move $VERSION from Makefile.inc into the single Makefile that uses it.

this should do two nice things:
- eliminate "nbsed" missing messages in builds
- slightly speed up the build by removing a few dozen exec sed calls

diffstat:

 crypto/external/bsd/heimdal/Makefile.inc             |  4 +---
 crypto/external/bsd/heimdal/bin/krb5-config/Makefile |  4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 0e3d140cdf85 -r 27ebd84c6c7c crypto/external/bsd/heimdal/Makefile.inc
--- a/crypto/external/bsd/heimdal/Makefile.inc  Wed Jul 22 21:25:03 2020 +0000
+++ b/crypto/external/bsd/heimdal/Makefile.inc  Thu Jul 23 07:53:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2019/12/17 00:17:00 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2020/07/23 07:53:35 mrg Exp $
 
 HEIMBASE?=     ${NETBSDSRCDIR}/crypto/external/bsd/heimdal
 HEIMDIST=      ${HEIMBASE}/dist
@@ -16,8 +16,6 @@
 LIBIPC_PIC=    ${LIBIPCDIR}/libipc_pic.a
 .endif
 
-VERSION!= ${TOOL_SED} -ne 's/.*PACKAGE_VERSION[        ]*"\([0-9.]*\)"/\1/p' ${.PARSEDIR}/include/config.h
-
 .if ${USETOOLS} != "yes"
 COMPILEETOBJ!=     cd ${HEIMBASE}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
 TOOL_COMPILE_ET=   ${COMPILEETOBJ}/compile_et
diff -r 0e3d140cdf85 -r 27ebd84c6c7c crypto/external/bsd/heimdal/bin/krb5-config/Makefile
--- a/crypto/external/bsd/heimdal/bin/krb5-config/Makefile      Wed Jul 22 21:25:03 2020 +0000
+++ b/crypto/external/bsd/heimdal/bin/krb5-config/Makefile      Thu Jul 23 07:53:35 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2019/12/17 00:16:26 christos Exp $
+#      $NetBSD: Makefile,v 1.5 2020/07/23 07:53:35 mrg Exp $
 
 .include <bsd.own.mk>
 .include <${.CURDIR}/../../Makefile.inc>
@@ -10,6 +10,8 @@
 
 CLEANFILES+=   krb5-config
 
+VERSION!= ${TOOL_SED} -ne 's/.*PACKAGE_VERSION[        ]*"\([0-9.]*\)"/\1/p' ${HEIMBASE}/include/config.h
+
 krb5-config: krb5-config.in
        ${TOOL_SED} \
                -e "s!@PACKAGE\@!heimdal!g" \



Home | Main Index | Thread Index | Old Index