From 1c22c47c35861016b1551a62befc70bb63069e5d Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Tue, 17 Apr 2007 15:52:37 +0000 Subject: [PATCH] Link libzpool, ztest and zdb against libpthread. Requested by: ru --- Makefile.inc1 | 4 ++-- cddl/lib/libzpool/Makefile | 4 ++-- cddl/usr.bin/ztest/Makefile | 4 ++-- cddl/usr.sbin/zdb/Makefile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 42913f57f014..d4e085d5130e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1016,11 +1016,11 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam \ + lib/libopie lib/libpam lib/libpthread \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ - ${_secure_lib_libssl} lib/libthr + ${_secure_lib_libssl} _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 9bf818c20b88..28e09b9f78e1 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -36,8 +36,8 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair -DPADD= ${LIBTHR} ${LIBZ} -LDADD= -lthr -lz +DPADD= ${LIBPTHREAD} ${LIBZ} +LDADD= -lpthread -lz # atomic.S doesn't like profiling. NO_PROFILE= diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile index b38426cec2c3..e109febad90f 100644 --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -15,7 +15,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBTHR} ${LIBUMEM} ${LIBZPOOL} -LDADD= -lavl -lm -lnvpair -lthr -lumem -lzpool +DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL} +LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool .include diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile index fd7cdec5af22..4b1f87549fbe 100644 --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -16,7 +16,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBTHR} ${LIBUMEM} ${LIBZPOOL} -LDADD= -lavl -lm -lnvpair -lthr -lumem -lzpool +DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL} +LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool .include