diff options
author | sos <sos@FreeBSD.org> | 1998-05-26 20:12:56 +0000 |
---|---|---|
committer | sos <sos@FreeBSD.org> | 1998-05-26 20:12:56 +0000 |
commit | bc60c8025eefe519b725f9a4d278ec3e887f7e00 (patch) | |
tree | 37210576f0aee50d6bf52bcf2871ece5963fc993 /share | |
parent | 37218a27856974855d62695874c9a46e494374dc (diff) | |
download | FreeBSD-src-bc60c8025eefe519b725f9a4d278ec3e887f7e00.zip FreeBSD-src-bc60c8025eefe519b725f9a4d278ec3e887f7e00.tar.gz |
ELF preparation step 2:
Move a.out libraries to /usr/lib/aout to make space for ELF libs.
Make rtld usr /usr/lib/aout as default library path.
Make ldconfig reject /usr/lib as an a.out library path.
Fix various Makefiles for LIBDIR!=/usr/lib breakage.
This will after a make world & reboot give a system that no
longer uses /usr/lib/*, infact one could remove all the old
libraries there, they are not used anymore.
We are getting close to an ELF make world, but I'll let this
all settle for a week or two...
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/bsd.libnames.mk | 108 | ||||
-rw-r--r-- | share/mk/bsd.own.mk | 6 |
2 files changed, 59 insertions, 55 deletions
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 040803c..9218d9f 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -1,65 +1,65 @@ -# $Id: bsd.libnames.mk,v 1.11 1998/05/15 09:30:12 bde Exp $ +# $Id: bsd.libnames.mk,v 1.12 1998/05/15 09:34:48 bde Exp $ # # The include file <bsd.libnames.mk> define library names. # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this # file where necessary. -LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o -LIBKZHEAD?= ${DESTDIR}/usr/lib/kzhead.o -LIBKZTAIL?= ${DESTDIR}/usr/lib/kztail.o +LIBCRT0?= ${DESTDIR}/${LIBDIR}/crt0.o +LIBKZHEAD?= ${DESTDIR}/${LIBDIR}/kzhead.o +LIBKZTAIL?= ${DESTDIR}/${LIBDIR}/kztail.o -LIBALIAS?= ${DESTDIR}/usr/lib/libalias.a -LIBC?= ${DESTDIR}/usr/lib/libc.a -LIBC_PIC= ${DESTDIR}/usr/lib/libc_pic.a -LIBCALENDAR?= ${DESTDIR}/usr/lib/libcalendar.a -LIBCOM_ERR= ${DESTDIR}/usr/lib/libcom_err.a -LIBCOMPAT?= ${DESTDIR}/usr/lib/libcompat.a -LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a -LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a -LIBDES?= ${DESTDIR}/usr/lib/libdes.a # XXX doesn't exist -LIBDIALOG?= ${DESTDIR}/usr/lib/libdialog.a -LIBDISK?= ${DESTDIR}/usr/lib/libdisk.a -LIBEDIT?= ${DESTDIR}/usr/lib/libedit.a -LIBF2C?= ${DESTDIR}/usr/lib/libf2c.a +LIBALIAS?= ${DESTDIR}/${LIBDIR}/libalias.a +LIBC?= ${DESTDIR}/${LIBDIR}/libc.a +LIBC_PIC= ${DESTDIR}/${LIBDIR}/libc_pic.a +LIBCALENDAR?= ${DESTDIR}/${LIBDIR}/libcalendar.a +LIBCOM_ERR= ${DESTDIR}/${LIBDIR}/libcom_err.a +LIBCOMPAT?= ${DESTDIR}/${LIBDIR}/libcompat.a +LIBCRYPT?= ${DESTDIR}/${LIBDIR}/libcrypt.a +LIBCURSES?= ${DESTDIR}/${LIBDIR}/libcurses.a +LIBDES?= ${DESTDIR}/${LIBDIR}/libdes.a # XXX doesn't exist +LIBDIALOG?= ${DESTDIR}/${LIBDIR}/libdialog.a +LIBDISK?= ${DESTDIR}/${LIBDIR}/libdisk.a +LIBEDIT?= ${DESTDIR}/${LIBDIR}/libedit.a +LIBF2C?= ${DESTDIR}/${LIBDIR}/libf2c.a LIBFL?= "don't use LIBFL, use LIBL" -LIBFORMS?= ${DESTDIR}/usr/lib/libforms.a -LIBFTPIO?= ${DESTDIR}/usr/lib/libftpio.a -LIBGPLUSPLUS?= ${DESTDIR}/usr/lib/libg++.a -LIBGCC?= ${DESTDIR}/usr/lib/libgcc.a -LIBGCC_PIC?= ${DESTDIR}/usr/lib/libgcc_pic.a -LIBGMP?= ${DESTDIR}/usr/lib/libgmp.a -LIBGNUREGEX?= ${DESTDIR}/usr/lib/libgnuregex.a -LIBIPX?= ${DESTDIR}/usr/lib/libipx.a -LIBKDB?= ${DESTDIR}/usr/lib/libkdb.a # XXX doesn't exist -LIBKRB?= ${DESTDIR}/usr/lib/libkrb.a # XXX doesn't exist -LIBKEYCAP?= ${DESTDIR}/usr/lib/libkeycap.a -LIBKVM?= ${DESTDIR}/usr/lib/libkvm.a -LIBL?= ${DESTDIR}/usr/lib/libl.a +LIBFORMS?= ${DESTDIR}/${LIBDIR}/libforms.a +LIBFTPIO?= ${DESTDIR}/${LIBDIR}/libftpio.a +LIBGPLUSPLUS?= ${DESTDIR}/${LIBDIR}/libg++.a +LIBGCC?= ${DESTDIR}/${LIBDIR}/libgcc.a +LIBGCC_PIC?= ${DESTDIR}/${LIBDIR}/libgcc_pic.a +LIBGMP?= ${DESTDIR}/${LIBDIR}/libgmp.a +LIBGNUREGEX?= ${DESTDIR}/${LIBDIR}/libgnuregex.a +LIBIPX?= ${DESTDIR}/${LIBDIR}/libipx.a +LIBKDB?= ${DESTDIR}/${LIBDIR}/libkdb.a # XXX doesn't exist +LIBKRB?= ${DESTDIR}/${LIBDIR}/libkrb.a # XXX doesn't exist +LIBKEYCAP?= ${DESTDIR}/${LIBDIR}/libkeycap.a +LIBKVM?= ${DESTDIR}/${LIBDIR}/libkvm.a +LIBL?= ${DESTDIR}/${LIBDIR}/libl.a LIBLN?= "don't use, LIBLN, use LIBL" -LIBM?= ${DESTDIR}/usr/lib/libm.a -LIBMD?= ${DESTDIR}/usr/lib/libmd.a -LIBMP?= ${DESTDIR}/usr/lib/libmp.a -LIBMYTINFO?= ${DESTDIR}/usr/lib/libmytinfo.a -LIBNCURSES?= ${DESTDIR}/usr/lib/libncurses.a -LIBOBJC?= ${DESTDIR}/usr/lib/libobjc.a -LIBOPIE?= ${DESTDIR}/usr/lib/libopie.a -LIBPC?= ${DESTDIR}/usr/lib/libpc.a # XXX doesn't exist -LIBPCAP?= ${DESTDIR}/usr/lib/libpcap.a -LIBPLOT?= ${DESTDIR}/usr/lib/libplot.a # XXX doesn't exist -LIBREADLINE?= ${DESTDIR}/usr/lib/libreadline.a -LIBRESOLV?= ${DESTDIR}/usr/lib/libresolv.a # XXX doesn't exist -LIBRPCSVC?= ${DESTDIR}/usr/lib/librpcsvc.a +LIBM?= ${DESTDIR}/${LIBDIR}/libm.a +LIBMD?= ${DESTDIR}/${LIBDIR}/libmd.a +LIBMP?= ${DESTDIR}/${LIBDIR}/libmp.a +LIBMYTINFO?= ${DESTDIR}/${LIBDIR}/libmytinfo.a +LIBNCURSES?= ${DESTDIR}/${LIBDIR}/libncurses.a +LIBOBJC?= ${DESTDIR}/${LIBDIR}/libobjc.a +LIBOPIE?= ${DESTDIR}/${LIBDIR}/libopie.a +LIBPC?= ${DESTDIR}/${LIBDIR}/libpc.a # XXX doesn't exist +LIBPCAP?= ${DESTDIR}/${LIBDIR}/libpcap.a +LIBPLOT?= ${DESTDIR}/${LIBDIR}/libplot.a # XXX doesn't exist +LIBREADLINE?= ${DESTDIR}/${LIBDIR}/libreadline.a +LIBRESOLV?= ${DESTDIR}/${LIBDIR}/libresolv.a # XXX doesn't exist +LIBRPCSVC?= ${DESTDIR}/${LIBDIR}/librpcsvc.a LIBSCRYPT?= "don't use LIBSCRYPT, use LIBCRYPT" -LIBSCSI?= ${DESTDIR}/usr/lib/libscsi.a -LIBSKEY?= ${DESTDIR}/usr/lib/libskey.a -LIBSS?= ${DESTDIR}/usr/lib/libss.a -LIBSTDCPLUSPLUS?= ${DESTDIR}/usr/lib/libstdc++.a -LIBTCL?= ${DESTDIR}/usr/lib/libtcl.a -LIBTELNET?= ${DESTDIR}/usr/lib/libtelnet.a -LIBTERMCAP?= ${DESTDIR}/usr/lib/libtermcap.a +LIBSCSI?= ${DESTDIR}/${LIBDIR}/libscsi.a +LIBSKEY?= ${DESTDIR}/${LIBDIR}/libskey.a +LIBSS?= ${DESTDIR}/${LIBDIR}/libss.a +LIBSTDCPLUSPLUS?= ${DESTDIR}/${LIBDIR}/libstdc++.a +LIBTCL?= ${DESTDIR}/${LIBDIR}/libtcl.a +LIBTELNET?= ${DESTDIR}/${LIBDIR}/libtelnet.a +LIBTERMCAP?= ${DESTDIR}/${LIBDIR}/libtermcap.a LIBTERMLIB?= "don't use LIBTERMLIB, use LIBTERMCAP" -LIBUTIL?= ${DESTDIR}/usr/lib/libutil.a -LIBXPG4?= ${DESTDIR}/usr/lib/libxpg4.a -LIBY?= ${DESTDIR}/usr/lib/liby.a -LIBZ?= ${DESTDIR}/usr/lib/libz.a +LIBUTIL?= ${DESTDIR}/${LIBDIR}/libutil.a +LIBXPG4?= ${DESTDIR}/${LIBDIR}/libxpg4.a +LIBY?= ${DESTDIR}/${LIBDIR}/liby.a +LIBZ?= ${DESTDIR}/${LIBDIR}/libz.a diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 48ac0b0..2d01cf1 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $Id: bsd.own.mk,v 1.12 1998/01/04 00:00:21 steve Exp $ +# $Id: bsd.own.mk,v 1.13 1998/03/19 13:32:43 bde Exp $ # # The include file <bsd.own.mk> set common variables for owner, # group, mode, and directories. Defaults are in brackets. @@ -122,7 +122,11 @@ BINGRP?= bin BINMODE?= 555 NOBINMODE?= 444 +.if ${BINFORMAT} == aout +LIBDIR?= /usr/lib/aout +.else LIBDIR?= /usr/lib +.endif LIBCOMPATDIR?= /usr/lib/compat LIBDATADIR?= /usr/libdata LINTLIBDIR?= /usr/libdata/lint |