Module Name: src
Committed By: elric
Date: Fri Apr 15 14:39:33 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal: Makefile.rules.inc
src/crypto/external/bsd/heimdal/lib/libkadm5clnt: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/heimdal/Makefile.rules.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/Makefile.rules.inc
diff -u src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.2 src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.3
--- src/crypto/external/bsd/heimdal/Makefile.rules.inc:1.2 Fri Apr 15 12:16:31 2011
+++ src/crypto/external/bsd/heimdal/Makefile.rules.inc Fri Apr 15 14:39:32 2011
@@ -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}
Index: src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile
diff -u src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.1 src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.2
--- src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile:1.1 Wed Apr 13 19:16:52 2011
+++ src/crypto/external/bsd/heimdal/lib/libkadm5clnt/Makefile Fri Apr 15 14:39:32 2011
@@ -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 \
