Date: Thu, 25 Feb 2010 14:42:27 +0000 (UTC) From: Ruslan Ermilov <ru@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r204311 - in head: share/mk tools/regression/file/closefrom tools/regression/file/flock tools/regression/gaithrstress tools/regression/kgssapi tools/regression/mqueue/mqtest1 tools/regr... Message-ID: <201002251442.o1PEgRui040427@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ru Date: Thu Feb 25 14:42:26 2010 New Revision: 204311 URL: http://svn.freebsd.org/changeset/base/204311 Log: Fixed missing or broken library dependencies. Modified: head/share/mk/bsd.libnames.mk head/tools/regression/file/closefrom/Makefile head/tools/regression/file/flock/Makefile head/tools/regression/gaithrstress/Makefile head/tools/regression/kgssapi/Makefile head/tools/regression/mqueue/mqtest1/Makefile head/tools/regression/mqueue/mqtest2/Makefile head/tools/regression/mqueue/mqtest3/Makefile head/tools/regression/mqueue/mqtest4/Makefile head/tools/regression/mqueue/mqtest5/Makefile head/tools/regression/netipx/ipxdgramloopback/Makefile head/tools/regression/netipx/spxabort/Makefile head/tools/regression/netipx/spxloopback/Makefile head/tools/regression/pthread/cv_cancel1/Makefile head/tools/regression/pthread/mutex_isowned_np/Makefile head/tools/regression/rpcsec_gss/Makefile head/tools/regression/sigqueue/sigqtest1/Makefile head/tools/regression/sigqueue/sigqtest2/Makefile head/tools/regression/sockets/sendfile/Makefile head/tools/regression/tls/libxx/Makefile head/tools/regression/tls/libyy/Makefile head/tools/regression/tls/ttls1/Makefile head/tools/regression/tls/ttls2/Makefile head/tools/regression/tls/ttls4/Makefile head/tools/tools/ether_reflect/Makefile head/tools/tools/net80211/stumbler/Makefile head/tools/tools/net80211/w00t/Makefile.inc Modified: head/share/mk/bsd.libnames.mk ============================================================================== --- head/share/mk/bsd.libnames.mk Thu Feb 25 14:36:50 2010 (r204310) +++ head/share/mk/bsd.libnames.mk Thu Feb 25 14:42:26 2010 (r204311) @@ -135,6 +135,8 @@ LIBRADIUS?= ${DESTDIR}${LIBDIR}/libradiu LIBREADLINE?= ${DESTDIR}${LIBDIR}/libreadline.a LIBROKEN?= ${DESTDIR}${LIBDIR}/libroken.a LIBRPCSVC?= ${DESTDIR}${LIBDIR}/librpcsvc.a +LIBRPCSEC_GSS?= ${DESTDIR}${LIBDIR}/librpcsec_gss.a +LIBRT?= ${DESTDIR}${LIBDIR}/librt.a LIBSBUF?= ${DESTDIR}${LIBDIR}/libsbuf.a LIBSDP?= ${DESTDIR}${LIBDIR}/libsdp.a LIBSMB?= ${DESTDIR}${LIBDIR}/libsmb.a Modified: head/tools/regression/file/closefrom/Makefile ============================================================================== --- head/tools/regression/file/closefrom/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/file/closefrom/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -3,7 +3,7 @@ PROG= closefrom MAN= WARNS?= 6 - +DPADD= ${LIBUTIL} LDADD= -lutil .include <bsd.prog.mk> Modified: head/tools/regression/file/flock/Makefile ============================================================================== --- head/tools/regression/file/flock/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/file/flock/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -3,7 +3,7 @@ PROG= flock NO_MAN= WARNS?= 6 - -LDADD+= -lpthread +DPADD= ${LIBPTHREAD} +LDADD= -lpthread .include <bsd.prog.mk> Modified: head/tools/regression/gaithrstress/Makefile ============================================================================== --- head/tools/regression/gaithrstress/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/gaithrstress/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= gaithrstress -LDADD+= -pthread +DPADD= ${LIBPTHREAD} +LDADD= -lpthread NO_MAN= .include <bsd.prog.mk> Modified: head/tools/regression/kgssapi/Makefile ============================================================================== --- head/tools/regression/kgssapi/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/kgssapi/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -3,6 +3,7 @@ PROG= gsstest NO_MAN= WARNS?= 2 +DPADD= ${LIBGSSAPI} ${LIBGSSAPI_KRB5} LDADD= -lgssapi -lgssapi_krb5 DEBUG_FLAGS= -g -O0 Modified: head/tools/regression/mqueue/mqtest1/Makefile ============================================================================== --- head/tools/regression/mqueue/mqtest1/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/mqueue/mqtest1/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -1,7 +1,8 @@ # $FreeBSD$ PROG=mqtest1 -LDADD+=-lrt +DPADD= ${LIBRT} +LDADD= -lrt NO_MAN= DEBUG_FLAGS=-g Modified: head/tools/regression/mqueue/mqtest2/Makefile ============================================================================== --- head/tools/regression/mqueue/mqtest2/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/mqueue/mqtest2/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -1,7 +1,8 @@ # $FreeBSD$ PROG=mqtest2 -LDADD+=-lrt +DPADD= ${LIBRT} +LDADD= -lrt NO_MAN= DEBUG_FLAGS=-g Modified: head/tools/regression/mqueue/mqtest3/Makefile ============================================================================== --- head/tools/regression/mqueue/mqtest3/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/mqueue/mqtest3/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -1,7 +1,8 @@ # $FreeBSD$ PROG=mqtest3 -LDADD+=-lrt +DPADD= ${LIBRT} +LDADD= -lrt NO_MAN= DEBUG_FLAGS=-g Modified: head/tools/regression/mqueue/mqtest4/Makefile ============================================================================== --- head/tools/regression/mqueue/mqtest4/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/mqueue/mqtest4/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -1,7 +1,8 @@ # $FreeBSD$ PROG=mqtest4 -LDADD+=-lrt +DPADD= ${LIBRT} +LDADD= -lrt NO_MAN= DEBUG_FLAGS=-g Modified: head/tools/regression/mqueue/mqtest5/Makefile ============================================================================== --- head/tools/regression/mqueue/mqtest5/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/mqueue/mqtest5/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -1,7 +1,8 @@ # $FreeBSD$ PROG=mqtest5 -LDADD+=-lrt +DPADD= ${LIBRT} +LDADD= -lrt NO_MAN= DEBUG_FLAGS=-g Modified: head/tools/regression/netipx/ipxdgramloopback/Makefile ============================================================================== --- head/tools/regression/netipx/ipxdgramloopback/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/netipx/ipxdgramloopback/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -5,7 +5,7 @@ PROG= ipxdgramloopback NO_MAN= -DPADD= ${LIBIPX}; +DPADD= ${LIBIPX} LDADD= -lipx WARNS?= 3 Modified: head/tools/regression/netipx/spxabort/Makefile ============================================================================== --- head/tools/regression/netipx/spxabort/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/netipx/spxabort/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -5,7 +5,7 @@ PROG= spxabort NO_MAN= -DPADD= ${LIBIPX}; +DPADD= ${LIBIPX} LDADD= -lipx WARNS?= 3 Modified: head/tools/regression/netipx/spxloopback/Makefile ============================================================================== --- head/tools/regression/netipx/spxloopback/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/netipx/spxloopback/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -5,7 +5,7 @@ PROG= spxloopback NO_MAN= -DPADD= ${LIBIPX}; +DPADD= ${LIBIPX} LDADD= -lipx WARNS?= 3 Modified: head/tools/regression/pthread/cv_cancel1/Makefile ============================================================================== --- head/tools/regression/pthread/cv_cancel1/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/pthread/cv_cancel1/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -2,7 +2,7 @@ PROG= cv_cancel1 NO_MAN= - +DPADD= ${LIBPTHREAD} LDADD= -lpthread .include <bsd.prog.mk> Modified: head/tools/regression/pthread/mutex_isowned_np/Makefile ============================================================================== --- head/tools/regression/pthread/mutex_isowned_np/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/pthread/mutex_isowned_np/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -2,7 +2,7 @@ PROG= mutex_isowned_np NO_MAN= - +DPADD= ${LIBPTHREAD} LDADD= -lpthread .include <bsd.prog.mk> Modified: head/tools/regression/rpcsec_gss/Makefile ============================================================================== --- head/tools/regression/rpcsec_gss/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/rpcsec_gss/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -3,6 +3,7 @@ PROG= rpctest NO_MAN= WARNS?= 6 +DPADD= ${LIBRPCSEC_GSS} LDADD= -lrpcsec_gss DEBUG_FLAGS= -g -O0 Modified: head/tools/regression/sigqueue/sigqtest1/Makefile ============================================================================== --- head/tools/regression/sigqueue/sigqtest1/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/sigqueue/sigqtest1/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -1,7 +1,6 @@ # $FreeBSD$ PROG=sigqtest1 -LDADD+= NO_MAN= DEBUG_FLAGS=-g Modified: head/tools/regression/sigqueue/sigqtest2/Makefile ============================================================================== --- head/tools/regression/sigqueue/sigqtest2/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/sigqueue/sigqtest2/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -1,7 +1,6 @@ # $FreeBSD$ PROG=sigqtest2 -LDADD+= NO_MAN= DEBUG_FLAGS=-g Modified: head/tools/regression/sockets/sendfile/Makefile ============================================================================== --- head/tools/regression/sockets/sendfile/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/sockets/sendfile/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -5,6 +5,7 @@ PROG= sendfile NO_MAN= WARNS?= 6 -LDADD = -lmd +DPADD= ${LIBMD} +LDADD= -lmd .include <bsd.prog.mk> Modified: head/tools/regression/tls/libxx/Makefile ============================================================================== --- head/tools/regression/tls/libxx/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/tls/libxx/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -1,7 +1,6 @@ # $FreeBSD$ -LIB= xx -SHLIB_MAJOR= 1 +SHLIB_NAME= libxx.so SRCS= xx.c #CFLAGS+=-mtls-dialect=sun Modified: head/tools/regression/tls/libyy/Makefile ============================================================================== --- head/tools/regression/tls/libyy/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/tls/libyy/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -1,7 +1,6 @@ # $FreeBSD$ -LIB= yy -SHLIB_MAJOR= 1 +SHLIB_NAME= libyy.so SRCS= yy.c CFLAGS+=-fpic Modified: head/tools/regression/tls/ttls1/Makefile ============================================================================== --- head/tools/regression/tls/ttls1/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/tls/ttls1/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -1,8 +1,8 @@ # $FreeBSD$ PROG= ttls1 -LDADD+= -L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx -LDADD+= -L../libyy -lyy -Wl,--rpath=${.OBJDIR}/../libyy +LDFLAGS+= -L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx +LDFLAGS+= -L../libyy -lyy -Wl,--rpath=${.OBJDIR}/../libyy NO_MAN= DEBUG_FLAGS= -g Modified: head/tools/regression/tls/ttls2/Makefile ============================================================================== --- head/tools/regression/tls/ttls2/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/tls/ttls2/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= ttls2 -LDADD+= -lpthread +DPADD= ${LIBPTHREAD} +LDADD= -lpthread NO_MAN= DEBUG_FLAGS= -g Modified: head/tools/regression/tls/ttls4/Makefile ============================================================================== --- head/tools/regression/tls/ttls4/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/regression/tls/ttls4/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= ttls4 -LDADD+= -lpthread +DPADD= ${LIBPTHREAD} +LDADD= -lpthread NO_MAN= DEBUG_FLAGS= -g Modified: head/tools/tools/ether_reflect/Makefile ============================================================================== --- head/tools/tools/ether_reflect/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/tools/ether_reflect/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -4,7 +4,7 @@ # A Makefile that builds both the ether_reflect program and its manual page. PROG= ether_reflect - -LDADD+= -lpcap +DPADD= ${LIBPCAP} +LDADD= -lpcap .include <bsd.prog.mk> Modified: head/tools/tools/net80211/stumbler/Makefile ============================================================================== --- head/tools/tools/net80211/stumbler/Makefile Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/tools/net80211/stumbler/Makefile Thu Feb 25 14:42:26 2010 (r204311) @@ -2,7 +2,7 @@ PROG= stumbler BINDIR= /usr/local/bin -DPADD= ${LIBPCAP} +DPADD= ${LIBPCAP} ${LIBNCURSES} LDADD= -lpcap -lncurses CFLAGS=-g NO_MAN= Modified: head/tools/tools/net80211/w00t/Makefile.inc ============================================================================== --- head/tools/tools/net80211/w00t/Makefile.inc Thu Feb 25 14:36:50 2010 (r204310) +++ head/tools/tools/net80211/w00t/Makefile.inc Thu Feb 25 14:42:26 2010 (r204311) @@ -3,7 +3,8 @@ W00T= ../libw00t # NB: we get crc32 from -lz DPADD= ${W00T}/libw00t.a ${LIBCRYPTO} ${LIBZ} -LDADD= -L${W00T} -lw00t -lcrypto -lz +LDFLAGS= -L${W00T} +LDADD= -lw00t -lcrypto -lz BINDIR= /usr/local/bin CFLAGS= -g -I${W00T}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002251442.o1PEgRui040427>