From 07cf2196478230f4a651965b6221434fad9bcaef Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Mon, 13 May 2002 09:01:18 +0000 Subject: Removed the a.out compatibility cruft. libgnumalloc.so.2 and libresolv.so.2 should be put under lib/compat/compat2?/ but I don't have the 2.x releases. --- lib/Makefile | 9 ++------- lib/libgnumalloc/Makefile | 37 ------------------------------------- lib/libgnumalloc/cfree.c | 12 ------------ lib/libresolv/Makefile | 40 ---------------------------------------- lib/libresolv/fakelib.c | 1 - 5 files changed, 2 insertions(+), 97 deletions(-) delete mode 100644 lib/libgnumalloc/Makefile delete mode 100644 lib/libgnumalloc/cfree.c delete mode 100644 lib/libresolv/Makefile delete mode 100644 lib/libresolv/fakelib.c (limited to 'lib') diff --git a/lib/Makefile b/lib/Makefile index 664528166186..c5d1fac0cc6c 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -25,10 +25,10 @@ SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd \ libncurses libradius librpcsvc libsbuf libtacplus libutil libypclnt \ ${_compat} libalias libatm ${_libbind} libbz2 libc ${_libc_r} \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ - libedit libfetch libform libftpio ${_libgnumalloc} ${_libio} libipsec \ + libedit libfetch libform libftpio ${_libio} libipsec \ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap \ - ${_libresolv} ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ + ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ libstand ${_libtelnet} libusbhid ${_libvgl} libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT}) @@ -39,11 +39,6 @@ _csu=csu/${MACHINE_ARCH} _csu=csu .endif -.if ${OBJFORMAT} == "aout" && ${MACHINE_ARCH} == "i386" -_libgnumalloc= libgnumalloc -_libresolv= libresolv -.endif - .if !defined(NOLIBC_R) && ${MACHINE_ARCH} != ia64 _libc_r= libc_r .endif diff --git a/lib/libgnumalloc/Makefile b/lib/libgnumalloc/Makefile deleted file mode 100644 index 8201a84b8359..000000000000 --- a/lib/libgnumalloc/Makefile +++ /dev/null @@ -1,37 +0,0 @@ -# $FreeBSD$ - -LIB= gnumalloc -INTERNALLIB= yes # Do not build or install ${LIB}*.a -SHLIB_MAJOR= 2 -SHLIB_MINOR= 0 - -SRCS= cfree.c - -.if ${OBJFORMAT} != aout -NOPIC= true -.endif - -# -# Before complaining about this, please *double-check* that you have -# updated the ldconfig path in /etc/rc to include /usr/lib/compat that -# was added in src/etc/rc rev 1.98. -# This is so that programs that use autoconf will not "detect" -lgnumalloc -# and continue to propagate the bogosity. The ldconfig path fix will enable -# you to run programs that were linked with -lgnumalloc (such as XFree86). -# -beforeinstall: - -rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.a \ - ${DESTDIR}${LIBDIR}/lib${LIB}_p.a \ - ${DESTDIR}${ORIG_SHLIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - ${DESTDIR}/usr/lib/compat/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - ${DESTDIR}/usr/lib/compat/lib${LIB}.so.${SHLIB_MAJOR} \ - ${DESTDIR}/usr/lib/compat/lib${LIB}.so \ - -.include - -# This must follow the .include in case SHLIBDIR is defined there. -ORIG_SHLIBDIR:= ${SHLIBDIR} - -# The ldconfig line in/etc/rc doesn't depend on ${LIBDIR} or ${SHLIBDIR}, -# so neither does this. -SHLIBDIR= /usr/lib/compat/aout diff --git a/lib/libgnumalloc/cfree.c b/lib/libgnumalloc/cfree.c deleted file mode 100644 index e57022867339..000000000000 --- a/lib/libgnumalloc/cfree.c +++ /dev/null @@ -1,12 +0,0 @@ -/* - * cfree.c - */ - -#include -__FBSDID("$FreeBSD$"); - -void -cfree(void *foo) -{ - free(foo); -} diff --git a/lib/libresolv/Makefile b/lib/libresolv/Makefile deleted file mode 100644 index 42f19936398d..000000000000 --- a/lib/libresolv/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD$ - -LIB= resolv -INTERNALLIB= yes # Do not build or install ${LIB}*.a -SHLIB_MAJOR= 2 -SHLIB_MINOR= 0 - -SRCS= fakelib.c - -.if ${OBJFORMAT} != aout -NOPIC= true -.endif - -# -# Before complaining about this, please *double-check* that you have -# updated the ldconfig path in /etc/rc to include /usr/lib/compat that -# was added in src/etc/rc rev 1.98. -# This is so that programs that use autoconf will not "detect" -lresolv -# and continue to propagate the bogosity. The ldconfig path fix will -# enable you to run programs that were linked with -lresolv. -# -# libresolv on FreeBSD-2.x **never did anything**!! -# -beforeinstall: - -rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.a \ - ${DESTDIR}${LIBDIR}/lib${LIB}_p.a \ - ${DESTDIR}${ORIG_SHLIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - ${DESTDIR}/usr/lib/compat/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \ - ${DESTDIR}/usr/lib/compat/lib${LIB}.so.${SHLIB_MAJOR} \ - ${DESTDIR}/usr/lib/compat/lib${LIB}.so - -.include - -# This must follow the .include in case SHLIBDIR is defined there. -ORIG_SHLIBDIR:= ${SHLIBDIR} - -# The ldconfig line in/etc/rc doesn't depend on ${LIBDIR} or ${SHLIBDIR}, -# so neither does this. -SHLIBDIR= /usr/lib/compat/aout diff --git a/lib/libresolv/fakelib.c b/lib/libresolv/fakelib.c deleted file mode 100644 index 0f7b46f76005..000000000000 --- a/lib/libresolv/fakelib.c +++ /dev/null @@ -1 +0,0 @@ -static int ___fake_library___; -- cgit v1.2.3