Module Name: src
Committed By: christos
Date: Thu Apr 11 01:27:47 UTC 2013
Modified Files:
src/share/mk: bsd.README bsd.hostprog.mk bsd.lib.mk
Log Message:
add new libevent2 libraries.
To generate a diff of this commit:
cvs rdiff -u -r1.314 -r1.315 src/share/mk/bsd.README
cvs rdiff -u -r1.69 -r1.70 src/share/mk/bsd.hostprog.mk
cvs rdiff -u -r1.333 -r1.334 src/share/mk/bsd.lib.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.314 src/share/mk/bsd.README:1.315
--- src/share/mk/bsd.README:1.314 Mon Mar 4 21:02:07 2013
+++ src/share/mk/bsd.README Wed Apr 10 21:27:46 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.314 2013/03/05 02:02:07 christos Exp $
+# $NetBSD: bsd.README,v 1.315 2013/04/11 01:27:46 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -1485,6 +1485,8 @@ DPADD Additional dependencies for the p
LIBDNS?= ${DESTDIR}/usr/lib/libdns.a
LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a
LIBEVENT?= ${DESTDIR}/usr/lib/libevent.a
+ LIBEVENT_OPENSSL?= ${DESTDIR}/usr/lib/libevent_openssl.a
+ LIBEVENT_PTHREADS?= ${DESTDIR}/usr/lib/libevent_pthreads.a
LIBEXPAT?= ${DESTDIR}/usr/lib/libexpat.a
LIBFETCH?= ${DESTDIR}/usr/lib/libfetch.a
LIBFORM?= ${DESTDIR}/usr/lib/libform.a
Index: src/share/mk/bsd.hostprog.mk
diff -u src/share/mk/bsd.hostprog.mk:1.69 src/share/mk/bsd.hostprog.mk:1.70
--- src/share/mk/bsd.hostprog.mk:1.69 Sat Feb 16 19:36:00 2013
+++ src/share/mk/bsd.hostprog.mk Wed Apr 10 21:27:47 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostprog.mk,v 1.69 2013/02/17 00:36:00 christos Exp $
+# $NetBSD: bsd.hostprog.mk,v 1.70 2013/04/11 01:27:47 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.include <bsd.init.mk>
@@ -21,6 +21,8 @@ LIBDBM?= /usr/lib/libdbm.a
LIBDES?= /usr/lib/libdes.a
LIBEDIT?= /usr/lib/libedit.a
LIBEVENT?= /usr/lib/libevent.a
+LIBEVENT_OPENSSL?= /usr/lib/libevent_openssl.a
+LIBEVENT_PTHREADS?= /usr/lib/libevent_pthreads.a
LIBEXPAT?= /usr/lib/libexpat.a
LIBFETCH?= /usr/lib/libfetch.a
LIBFORM?= /usr/lib/libform.a
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.333 src/share/mk/bsd.lib.mk:1.334
--- src/share/mk/bsd.lib.mk:1.333 Thu Apr 4 17:15:15 2013
+++ src/share/mk/bsd.lib.mk Wed Apr 10 21:27:47 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.333 2013/04/04 21:15:15 christos Exp $
+# $NetBSD: bsd.lib.mk,v 1.334 2013/04/11 01:27:47 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -444,6 +444,7 @@ _DEST.LIB:=${DESTDIR}${LIBDIR}
_DEST.OBJ:=${DESTDIR}${_LIBSODIR}
_DEST.LINT:=${DESTDIR}${LINTLIBDIR}
_DEST.DEBUG:=${DESTDIR}${DEBUGDIR}${LIBDIR}
+_DEST.ODEBUG:=${DESTDIR}${DEBUGDIR}${_LIBSODIR}
.if defined(LIB) # {
.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != "") \
@@ -839,6 +840,10 @@ ${_DEST.DEBUG}/${_LIB.so.debug}: ${_LIB.
${_MKTARGET_INSTALL}
${INSTALL_FILE} -o ${DEBUGOWN} -g ${DEBUGGRP} -m ${DEBUGMODE} \
${.ALLSRC} ${.TARGET}
+.if ${_LIBSODIR} != ${LIBDIR}
+ ${INSTALL_SYMLINK} -l r ${_DEST.DEBUG}/${_LIB.so.debug} \
+ ${_DEST.ODEBUG}/${_LIB.so.debug}
+.endif
.endif
.if ${MKLINT} != "no" && !empty(LOBJS)
