diff options
| -rw-r--r-- | lib/Makefile | 7 | ||||
| -rw-r--r-- | share/man/man3/Makefile | 2 | ||||
| -rw-r--r-- | share/mk/bsd.compat.mk | 1 | ||||
| -rw-r--r-- | share/mk/bsd.libnames.mk | 1 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 2 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 4 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_LIBC_R | 5 |
7 files changed, 2 insertions, 20 deletions
diff --git a/lib/Makefile b/lib/Makefile index bdb3678..35328f5 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -27,7 +27,7 @@ SUBDIR= ${_csu} libbsm libcom_err libcrypt libkvm msun libmd libncurses \ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ ${_libypclnt} libalias libarchive ${_libatm} \ - libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ + libbegemot ${_libbluetooth} libbsnmp libbz2 libc \ libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \ libgssapi libipsec \ @@ -76,11 +76,6 @@ _libvgl= libvgl _libsmb= libsmb .endif -.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "ia64" && \ - ${MACHINE_ARCH} != "powerpc" && ${MK_LIBC_R} != "no" -_libc_r= -.endif - .if ${MK_SENDMAIL} != "no" _libmilter= libmilter _libsm= libsm diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 7006471..fcc94ef 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -146,7 +146,7 @@ MLINKS+= tree.3 RB_EMPTY.3 \ tree.3 SPLAY_RIGHT.3 \ tree.3 SPLAY_ROOT.3 -.if ${MK_LIBC_R} != "no" || ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no" +.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no" PTHREAD_MAN= pthread.3 \ pthread_atfork.3 \ pthread_attr.3 \ diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index d7eada6..dfa5dfc 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -15,7 +15,6 @@ NOINFO:NO_INFO \ NOINFOCOMPRESS:NO_INFOCOMPRESS \ NOINSTALLLIB:NO_INSTALLLIB \ - NOLIBC_R:NO_LIBC_R \ NOLIBPTHREAD:NO_LIBPTHREAD \ NOLIBTHR:NO_LIBTHR \ NOLINT:NO_LINT \ diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 55fb952..deda217 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -26,7 +26,6 @@ LIBBSNMP?= ${DESTDIR}${LIBDIR}/libbsnmp.a LIBBZ2?= ${DESTDIR}${LIBDIR}/libbz2.a LIBC?= ${DESTDIR}${LIBDIR}/libc.a LIBC_PIC?= ${DESTDIR}${LIBDIR}/libc_pic.a -LIBC_R?= ${DESTDIR}${LIBDIR}/libc_r.a LIBCALENDAR?= ${DESTDIR}${LIBDIR}/libcalendar.a LIBCAM?= ${DESTDIR}${LIBDIR}/libcam.a LIBCOM_ERR?= ${DESTDIR}${LIBDIR}/libcom_err.a diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index febb85b..ea660dd 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -233,7 +233,6 @@ WITHOUT_${var}= IPX \ KERBEROS \ LIB32 \ - LIBC_R \ LIBPTHREAD \ LIBTHR \ LOCALES \ @@ -320,7 +319,6 @@ WITH_IDEA= IPX \ KERBEROS \ LIB32 \ - LIBC_R \ LIBPTHREAD \ LIBTHR \ LOCALES \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index caab635..4eab690 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -872,10 +872,6 @@ OLD_FILES+=usr/share/man/man8/ktutil.8.gz # to be filled in #.endif -#.if ${MK_LIBC_R} == no -# to be filled in -#.endif - #.if ${MK_LIBPTHREAD} == no # to be filled in #.endif diff --git a/tools/build/options/WITHOUT_LIBC_R b/tools/build/options/WITHOUT_LIBC_R deleted file mode 100644 index 7b88541..0000000 --- a/tools/build/options/WITHOUT_LIBC_R +++ /dev/null @@ -1,5 +0,0 @@ -.\" $FreeBSD$ -Set to not build -.Nm libc_r -(reentrant version of -.Nm libc ) . |
