diff options
| author | Robert Peichaer <rpe@cvs.openbsd.org> | 2017-11-05 10:29:25 +0000 |
|---|---|---|
| committer | Robert Peichaer <rpe@cvs.openbsd.org> | 2017-11-05 10:29:25 +0000 |
| commit | 2b3a46c29190b63ef7df6030edba6a9b2b1ec71a (patch) | |
| tree | 05895ed99018e9b4368387efbe8f9367b668d782 /share/mk | |
| parent | f68e9694a72eb5ed92202034f2586a2e441b3c04 (diff) | |
Consolidate lib.so.*.a, ld.so.a and the kernel relink kit into
one location under /usr/share/relink.
Be more specific in src/etc/rc reorder_libs() what filesystems
need r/w remount and ensure that their mount state is restored.
Idea and positive feedback from deraadt@
OK aja@ tb@
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.lib.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index cf6fdb0832c..57552f58f9c 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.lib.mk,v 1.90 2017/08/09 06:15:29 robert Exp $ +# $OpenBSD: bsd.lib.mk,v 1.91 2017/11/05 10:29:24 rpe Exp $ # $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $ # @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 @@ -288,8 +288,10 @@ realinstall: ${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${FULLSHLIBNAME} ${DESTDIR}${LIBDIR} .if defined(LIBREBUILD) + ${INSTALL} -d -o ${LIBOWN} -g ${LIBGRP} -m 755 \ + ${DESTDIR}/usr/share/relink/${LIBDIR} ${INSTALL} ${INSTALL_COPY} -S -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ - ${FULLSHLIBNAME}.a ${DESTDIR}${LIBDIR} + ${FULLSHLIBNAME}.a ${DESTDIR}/usr/share/relink/${LIBDIR} .endif .endif .if defined(LINKS) && !empty(LINKS) |