diff options
| author | martin <martin@NetBSD.org> | 2019-09-27 09:24:29 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2019-09-27 09:24:29 +0000 |
| commit | a7936de3d07f4d886e0769b4fa431db49522efef (patch) | |
| tree | 21bc017d4e4fa602658b575effab8a06f7a4adf5 /lib | |
| parent | a2855c8d87ba88d6eabdf9eb502c4882cb432de5 (diff) | |
Pull up following revision(s) (requested by brad in ticket #252):
external/cddl/osnet/lib/libzpool/Makefile: revision 1.13
lib/libpthread/Makefile: revision 1.95
external/cddl/osnet/lib/libuutil/Makefile: revision 1.6
distrib/sets/lists/base/shl.mi: revision 1.871
external/cddl/osnet/lib/libzfs_core/Makefile: revision 1.2
external/cddl/osnet/lib/libnvpair/Makefile: revision 1.11
external/cddl/osnet/lib/libzfs/Makefile: revision 1.10
external/cddl/osnet/lib/libavl/Makefile: revision 1.6
distrib/sets/lists/debug/shl.mi: revision 1.230
external/cddl/osnet/lib/libumem/Makefile: revision 1.7
Add USE_SHLIBDIR=yes to a number of Makefiles for the libraries used
by /sbin/{zfs,zpool,mount_zfs}. The general effect is to move them
from /usr/lib to /lib. Compatibility links are installed in /usr/lib
and nothing that is installed, say in /usr/pkg, appears to break.
With this, it is possible to have a /var and /usr mount using ZFS
legacy mounting early on in the boot process.
Run tested on amd64 and i386 and compile tested on evbarm.
Fix MKDEBUG distrib sets
Add libpthread, libnvpair and ZFS libs to dynamicroot.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libpthread/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile index 81b28cf1e53..7c4a76afeb5 100644 --- a/lib/libpthread/Makefile +++ b/lib/libpthread/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.94 2019/05/07 18:45:37 maya Exp $ +# $NetBSD: Makefile,v 1.94.2.1 2019/09/27 09:24:29 martin Exp $ # NOSANITIZER= # defined @@ -7,6 +7,8 @@ LIB= pthread .include <bsd.own.mk> +USE_SHLIBDIR= yes + .if defined(PTHREAD_MACHINE_ARCH) && !empty(PTHREAD_MACHINE_ARCH) && \ exists(${.CURDIR}/arch/${PTHREAD_MACHINE_ARCH}) ARCHSUBDIR= ${PTHREAD_MACHINE_ARCH} |
