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 Need a variable to disable using...



details:   https://anonhg.NetBSD.org/src/rev/2843fbbfaf21
branches:  trunk
changeset: 764298:2843fbbfaf21
user:      elric <elric%NetBSD.org@localhost>
date:      Fri Apr 15 14:39:32 2011 +0000

description:
Need a variable to disable using an existent version-script.map as
dist/lib/kadm5 contains one but builds two libs only one of which
uses it.

diffstat:

 crypto/external/bsd/heimdal/Makefile.rules.inc        |  4 ++--
 crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile |  3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 271dc8aa380e -r 2843fbbfaf21 crypto/external/bsd/heimdal/Makefile.rules.inc
--- a/crypto/external/bsd/heimdal/Makefile.rules.inc    Fri Apr 15 14:36:28 2011 +0000
+++ b/crypto/external/bsd/heimdal/Makefile.rules.inc    Fri Apr 15 14:39:32 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rules.inc,v 1.2 2011/04/15 12:16:31 elric Exp $
+# $NetBSD: Makefile.rules.inc,v 1.3 2011/04/15 14:39:32 elric Exp $
 
 SRCS+= ${HEIMSRCS:N*.et:N*.in:N*.asn1}
 
@@ -91,7 +91,7 @@
 OBJS.${PROG} += ${OBJS}
 .endif
 
-.if defined(LIB) && exists(version-script.map)
+.if defined(LIB) && exists(version-script.map) && !defined(NO_VERSION_SCRIPT)
 version-script.map:
 
 LDFLAGS.lib${LIB} += -Wl,--version-script=${version-script.map:P}
diff -r 271dc8aa380e -r 2843fbbfaf21 crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
--- a/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile     Fri Apr 15 14:36:28 2011 +0000
+++ b/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile     Fri Apr 15 14:39:32 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/13 19:16:52 elric Exp $
+# $NetBSD: Makefile,v 1.2 2011/04/15 14:39:32 elric Exp $
 
 USE_FORT?= yes # network protocol library
 
@@ -37,6 +37,7 @@
        rename_c.c      \
        send_recv.c
 
+NO_VERSION_SCRIPT=
 
 INCSDIR=       /usr/include/kadm5
 INCS=          admin.h                 \



Home | Main Index | Thread Index | Old Index