From 8b28ef95280c56bcdc893923c5325d9f4b61d1e5 Mon Sep 17 00:00:00 2001 From: Thomas Moestl Date: Wed, 4 Apr 2001 18:17:28 +0000 Subject: [PATCH] Activate build of posix1e extensions in libc and libc_r that have been moved in from libposix1e, and deactivate build of the soon-to-be-removed libposix1e. Approved by: rwatson Obtained from: TrustedBSD Project --- lib/Makefile | 2 +- lib/libc/Makefile.inc | 1 + lib/libc_r/uthread/Makefile.inc | 6 ++++++ lib/libkse/thread/Makefile.inc | 6 ++++++ lib/libpthread/thread/Makefile.inc | 6 ++++++ 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/Makefile b/lib/Makefile index 6dfc7a3d40da..558ef64e9480 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -27,7 +27,7 @@ SUBDIR= ${_csu} libcom_err libcrypt msun libmd \ libftpio libgnumalloc ${_libio} libipsec libipx libisc libkvm libmenu \ ${_libncp} \ libnetgraph libopie libpam libpanel libpcap \ - libposix1e libresolv librpcsvc libsmdb libsmutil libss \ + libresolv librpcsvc libsmdb libsmutil libss \ libstand ${_libtelnet} libusb ${_libvgl} libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-${OBJFORMAT}) diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc index 2994f0e5c49c..b376fe8a4dd3 100644 --- a/lib/libc/Makefile.inc +++ b/lib/libc/Makefile.inc @@ -24,6 +24,7 @@ NOASM= .include "${.CURDIR}/../libc/locale/Makefile.inc" .include "${.CURDIR}/../libc/net/Makefile.inc" .include "${.CURDIR}/../libc/nls/Makefile.inc" +.include "${.CURDIR}/../libc/posix1e/Makefile.inc" .if !defined(NO_QUAD) .include "${.CURDIR}/../libc/quad/Makefile.inc" .endif diff --git a/lib/libc_r/uthread/Makefile.inc b/lib/libc_r/uthread/Makefile.inc index cf9e154df50d..8c1e5677eb72 100644 --- a/lib/libc_r/uthread/Makefile.inc +++ b/lib/libc_r/uthread/Makefile.inc @@ -5,6 +5,10 @@ SRCS+= \ uthread_accept.c \ + uthread_acl_delete_fd.c \ + uthread_acl_get_fd.c \ + uthread_acl_set_fd.c \ + uthread_acl_aclcheck_fd.c \ uthread_aio_suspend.c \ uthread_attr_destroy.c \ uthread_attr_init.c \ @@ -26,6 +30,8 @@ SRCS+= \ uthread_autoinit.cc \ uthread_bind.c \ uthread_cancel.c \ + uthread_cap_get_fd.c \ + uthread_cap_set_fd.c \ uthread_clean.c \ uthread_close.c \ uthread_cond.c \ diff --git a/lib/libkse/thread/Makefile.inc b/lib/libkse/thread/Makefile.inc index cf9e154df50d..8c1e5677eb72 100644 --- a/lib/libkse/thread/Makefile.inc +++ b/lib/libkse/thread/Makefile.inc @@ -5,6 +5,10 @@ SRCS+= \ uthread_accept.c \ + uthread_acl_delete_fd.c \ + uthread_acl_get_fd.c \ + uthread_acl_set_fd.c \ + uthread_acl_aclcheck_fd.c \ uthread_aio_suspend.c \ uthread_attr_destroy.c \ uthread_attr_init.c \ @@ -26,6 +30,8 @@ SRCS+= \ uthread_autoinit.cc \ uthread_bind.c \ uthread_cancel.c \ + uthread_cap_get_fd.c \ + uthread_cap_set_fd.c \ uthread_clean.c \ uthread_close.c \ uthread_cond.c \ diff --git a/lib/libpthread/thread/Makefile.inc b/lib/libpthread/thread/Makefile.inc index cf9e154df50d..8c1e5677eb72 100644 --- a/lib/libpthread/thread/Makefile.inc +++ b/lib/libpthread/thread/Makefile.inc @@ -5,6 +5,10 @@ SRCS+= \ uthread_accept.c \ + uthread_acl_delete_fd.c \ + uthread_acl_get_fd.c \ + uthread_acl_set_fd.c \ + uthread_acl_aclcheck_fd.c \ uthread_aio_suspend.c \ uthread_attr_destroy.c \ uthread_attr_init.c \ @@ -26,6 +30,8 @@ SRCS+= \ uthread_autoinit.cc \ uthread_bind.c \ uthread_cancel.c \ + uthread_cap_get_fd.c \ + uthread_cap_set_fd.c \ uthread_clean.c \ uthread_close.c \ uthread_cond.c \