Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Enable MKDYNAMICROOT=yes by default.
details: https://anonhg.NetBSD.org/src/rev/fdead5f1dd19
branches: trunk
changeset: 536813:fdead5f1dd19
user: lukem <lukem%NetBSD.org@localhost>
date: Sun Sep 22 15:08:17 2002 +0000
description:
Enable MKDYNAMICROOT=yes by default.
This means that:
+ /bin and /sbin (and the few programs in /usr/* which were statically
linked) are now dynamically linked.
+ The shared libraries that are needed by the /bin and /sbin programs
are now installed into /lib (with compatability symlinks from
/usr/lib). These are:
c crypt edit ipsec kvm m m387 termcap termlib util z
+ The shared linker is now in /libexec/ld.elf_so, and
/usr/libexec/ld.elf_so is a symlink to the former.
If you want the prior behaviour of "some applications statically linked,
the rest dynamically linked", set MKDYNAMICROOT=no in your mk.conf(5).
If you have a philosophical objection to dynamic libraries, continue
to set LDSTATIC=-static in your mk.conf(5), and please don't waste any
more time in trying to convince us why dynamic libraries are 3v1l.
diffstat:
distrib/sets/lists/base/md.i386 | 4 +++-
distrib/sets/lists/base/shl.elf | 25 ++++++++++++++++++-------
distrib/sets/lists/base/shl.mi | 24 +++++++++++++++++-------
distrib/sets/lists/comp/md.i386 | 7 ++++---
distrib/sets/lists/comp/shl.elf | 24 +++++++++++++++++-------
share/mk/bsd.README | 10 +++++++---
share/mk/bsd.own.mk | 4 ++--
7 files changed, 68 insertions(+), 30 deletions(-)
diffs (200 lines):
diff -r 9e3f336cc030 -r fdead5f1dd19 distrib/sets/lists/base/md.i386
--- a/distrib/sets/lists/base/md.i386 Sun Sep 22 13:27:25 2002 +0000
+++ b/distrib/sets/lists/base/md.i386 Sun Sep 22 15:08:17 2002 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: md.i386,v 1.94 2002/08/29 01:30:41 lukem Exp $
+# $NetBSD: md.i386,v 1.95 2002/09/22 15:08:17 lukem Exp $
+./lib/libm387.so.0 base-sys-shlib
+./lib/libm387.so.0.0 base-sys-shlib
./rescue/fdisk base-rescue-root
./rescue/ldconfig base-rescue-root
./sbin/fdisk base-sysutil-root
diff -r 9e3f336cc030 -r fdead5f1dd19 distrib/sets/lists/base/shl.elf
--- a/distrib/sets/lists/base/shl.elf Sun Sep 22 13:27:25 2002 +0000
+++ b/distrib/sets/lists/base/shl.elf Sun Sep 22 15:08:17 2002 +0000
@@ -1,5 +1,22 @@
-# $NetBSD: shl.elf,v 1.58 2002/08/20 13:49:55 jdarrow Exp $
+# $NetBSD: shl.elf,v 1.59 2002/09/22 15:08:18 lukem Exp $
# Note: libtermcap and libtermlib are hardlinked and share the same version.
+./lib/libc.so.12 base-sys-shlib
+./lib/libcrypt.so.0 base-sys-shlib
+./lib/libedit.so.2 base-sys-shlib
+./lib/libipsec.so.2 base-net-shlib
+./lib/libkvm.so.5 base-sys-shlib
+./lib/libm.so.0 base-sys-shlib
+./lib/libtermcap.so.0 base-sys-shlib
+./lib/libtermlib.so.0 base-sys-shlib
+./lib/libutil.so.6 base-sys-shlib
+./lib/libz.so.0 base-sys-shlib
+./libexec/ld.elf_so base-sys-shlib
+./usr/lib/i18n/libBIG5.so.4 base-i18n-shlib
+./usr/lib/i18n/libEUC.so.4 base-i18n-shlib
+./usr/lib/i18n/libEUCTW.so.4 base-i18n-shlib
+./usr/lib/i18n/libISO2022.so.4 base-i18n-shlib
+./usr/lib/i18n/libMSKanji.so.4 base-i18n-shlib
+./usr/lib/i18n/libUTF8.so.4 base-i18n-shlib
./usr/lib/libamu.so.2 base-amd-shlib
./usr/lib/libasn1.so.6 base-krb5-shlib
./usr/lib/libbz2.so.1 base-sys-shlib
@@ -45,10 +62,4 @@
./usr/lib/libutil.so.6 base-sys-shlib
./usr/lib/libwrap.so.0 base-net-shlib
./usr/lib/libz.so.0 base-sys-shlib
-./usr/lib/i18n/libBIG5.so.4 base-i18n-shlib
-./usr/lib/i18n/libEUC.so.4 base-i18n-shlib
-./usr/lib/i18n/libMSKanji.so.4 base-i18n-shlib
-./usr/lib/i18n/libUTF8.so.4 base-i18n-shlib
-./usr/lib/i18n/libEUCTW.so.4 base-i18n-shlib
-./usr/lib/i18n/libISO2022.so.4 base-i18n-shlib
./usr/libexec/ld.elf_so base-sys-shlib
diff -r 9e3f336cc030 -r fdead5f1dd19 distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi Sun Sep 22 13:27:25 2002 +0000
+++ b/distrib/sets/lists/base/shl.mi Sun Sep 22 15:08:17 2002 +0000
@@ -1,5 +1,21 @@
-# $NetBSD: shl.mi,v 1.178 2002/09/21 14:16:45 skrll Exp $
+# $NetBSD: shl.mi,v 1.179 2002/09/22 15:08:18 lukem Exp $
# Note: libtermcap and libtermlib are hardlinked and share the same version.
+./lib/libc.so.12.88 base-sys-shlib
+./lib/libcrypt.so.0.1 base-sys-shlib
+./lib/libedit.so.2.6 base-sys-shlib
+./lib/libipsec.so.2.0 base-net-shlib
+./lib/libkvm.so.5.1 base-sys-shlib
+./lib/libm.so.0.1 base-sys-shlib
+./lib/libtermcap.so.0.5 base-sys-shlib
+./lib/libtermlib.so.0.5 base-sys-shlib
+./lib/libutil.so.6.4 base-sys-shlib
+./lib/libz.so.0.3 base-sys-shlib
+./usr/lib/i18n/libBIG5.so.4.0 base-i18n-shlib
+./usr/lib/i18n/libEUC.so.4.0 base-i18n-shlib
+./usr/lib/i18n/libEUCTW.so.4.0 base-i18n-shlib
+./usr/lib/i18n/libISO2022.so.4.0 base-i18n-shlib
+./usr/lib/i18n/libMSKanji.so.4.0 base-i18n-shlib
+./usr/lib/i18n/libUTF8.so.4.0 base-i18n-shlib
./usr/lib/libamu.so.2.1 base-amd-shlib
./usr/lib/libasn1.so.6.1 base-krb5-shlib
./usr/lib/libbz2.so.1.0 base-sys-shlib
@@ -45,9 +61,3 @@
./usr/lib/libutil.so.6.4 base-sys-shlib
./usr/lib/libwrap.so.0.2 base-net-shlib
./usr/lib/libz.so.0.3 base-sys-shlib
-./usr/lib/i18n/libBIG5.so.4.0 base-i18n-shlib
-./usr/lib/i18n/libEUC.so.4.0 base-i18n-shlib
-./usr/lib/i18n/libEUCTW.so.4.0 base-i18n-shlib
-./usr/lib/i18n/libISO2022.so.4.0 base-i18n-shlib
-./usr/lib/i18n/libMSKanji.so.4.0 base-i18n-shlib
-./usr/lib/i18n/libUTF8.so.4.0 base-i18n-shlib
diff -r 9e3f336cc030 -r fdead5f1dd19 distrib/sets/lists/comp/md.i386
--- a/distrib/sets/lists/comp/md.i386 Sun Sep 22 13:27:25 2002 +0000
+++ b/distrib/sets/lists/comp/md.i386 Sun Sep 22 15:08:17 2002 +0000
@@ -1,4 +1,5 @@
-# $NetBSD: md.i386,v 1.63 2002/09/07 12:48:52 gehenna Exp $
+# $NetBSD: md.i386,v 1.64 2002/09/22 15:08:19 lukem Exp $
+./lib/libm387.so base-sys-shlib
./usr/include/i386 comp-c-include
./usr/include/i386/_G_config.h comp-c-include
./usr/include/i386/ansi.h comp-c-include
@@ -66,6 +67,8 @@
./usr/include/i386/varargs.h comp-c-include
./usr/include/i386/vm86.h comp-c-include
./usr/include/i386/vmparam.h comp-c-include
+./usr/include/ieeefp.h comp-c-include
+./usr/include/pmc.h comp-c-include
./usr/lib/libi386.a comp-c-lib
./usr/lib/libi386.so base-sys-shlib
./usr/lib/libi386_p.a comp-c-proflib
@@ -80,5 +83,3 @@
./usr/lib/libpmc_pic.a comp-c-piclib
./usr/libdata/lint/llib-li386.ln comp-c-lintlib
./usr/libdata/lint/llib-lpmc.ln comp-c-lintlib
-./usr/include/ieeefp.h comp-c-include
-./usr/include/pmc.h comp-c-include
diff -r 9e3f336cc030 -r fdead5f1dd19 distrib/sets/lists/comp/shl.elf
--- a/distrib/sets/lists/comp/shl.elf Sun Sep 22 13:27:25 2002 +0000
+++ b/distrib/sets/lists/comp/shl.elf Sun Sep 22 15:08:17 2002 +0000
@@ -1,6 +1,22 @@
-# $NetBSD: shl.elf,v 1.28 2002/03/26 22:58:18 fredette Exp $
+# $NetBSD: shl.elf,v 1.29 2002/09/22 15:08:19 lukem Exp $
+./lib/libc.so comp-c-lib
+./lib/libcrypt.so comp-c-lib
+./lib/libedit.so comp-c-lib
+./lib/libipsec.so comp-c-lib
+./lib/libkvm.so comp-c-lib
+./lib/libm.so comp-c-lib
+./lib/libtermcap.so comp-c-lib
+./lib/libtermlib.so comp-c-lib
+./lib/libutil.so comp-c-lib
+./lib/libz.so comp-c-lib
./usr/lib/crtbeginS.o comp-c-lib
./usr/lib/crtendS.o comp-c-lib
+./usr/lib/i18n/libBIG5.so comp-i18n-lib
+./usr/lib/i18n/libEUC.so comp-i18n-lib
+./usr/lib/i18n/libEUCTW.so comp-i18n-lib
+./usr/lib/i18n/libISO2022.so comp-i18n-lib
+./usr/lib/i18n/libMSKanji.so comp-i18n-lib
+./usr/lib/i18n/libUTF8.so comp-i18n-lib
./usr/lib/libasn1.so comp-c-lib
./usr/lib/libbz2.so comp-c-lib
./usr/lib/libc.so comp-c-lib
@@ -45,9 +61,3 @@
./usr/lib/libutil.so comp-c-lib
./usr/lib/libwrap.so comp-c-lib
./usr/lib/libz.so comp-c-lib
-./usr/lib/i18n/libBIG5.so comp-i18n-lib
-./usr/lib/i18n/libEUC.so comp-i18n-lib
-./usr/lib/i18n/libEUCTW.so comp-i18n-lib
-./usr/lib/i18n/libISO2022.so comp-i18n-lib
-./usr/lib/i18n/libMSKanji.so comp-i18n-lib
-./usr/lib/i18n/libUTF8.so comp-i18n-lib
diff -r 9e3f336cc030 -r fdead5f1dd19 share/mk/bsd.README
--- a/share/mk/bsd.README Sun Sep 22 13:27:25 2002 +0000
+++ b/share/mk/bsd.README Sun Sep 22 15:08:17 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.103 2002/09/17 23:18:29 thorpej Exp $
+# $NetBSD: bsd.README,v 1.104 2002/09/22 15:08:19 lukem Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the new make "include" files for the BSD
@@ -97,6 +97,10 @@
MKDOC If "no", don't build or install the documentation.
+MKDYNAMICROOT If "no", build programs in /bin and /sbin statically,
+ don't install certain libraries in /lib, and don't
+ install the shared linker into /libexec.
+
MKGDB If "no", don't build gdb.
MKGCC If "no", don't build gcc or any of the gcc-related
@@ -244,12 +248,12 @@
SHLIBDIR If ${USE_SHLIBDIR} is "yes", use ${SHLIBDIR} instead of
${LIBDIR} as the base path for shared library installation.
- [/usr/lib]
+ [/lib]
_LIBSODIR Set to ${SHLIBDIR} if ${USE_SHLIBDIR} is "yes",
otherwise set to ${LIBDIR}
-SHLINKDIR Base path for shared linker. [/usr/libexec]
+SHLINKDIR Base path for shared linker. [/libexec]
LINTLIBDIR Base path for lint(1) library installation. [/usr/libdata/lint]
diff -r 9e3f336cc030 -r fdead5f1dd19 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk Sun Sep 22 13:27:25 2002 +0000
+++ b/share/mk/bsd.own.mk Sun Sep 22 15:08:17 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.310 2002/09/17 23:18:30 thorpej Exp $
+# $NetBSD: bsd.own.mk,v 1.311 2002/09/22 15:08:19 lukem Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -213,7 +213,7 @@
# libraries moved from /usr/lib to /lib and the shared linker moved
# from /usr/libexec to /lib
#
-MKDYNAMICROOT?= no
+MKDYNAMICROOT?= yes
# Where the system object and source trees are kept; can be configurable
# by the user in case they want them in ~/foosrc and ~/fooobj (for example).
Home |
Main Index |
Thread Index |
Old Index