summaryrefslogtreecommitdiffstats
path: root/lib/libpthread
diff options
context:
space:
mode:
authormarc <marc@openbsd.org>2003-01-14 20:04:44 +0000
committermarc <marc@openbsd.org>2003-01-14 20:04:44 +0000
commit113e1ebb881a4e177614dc56d8806250d1b8f56b (patch)
tree17a531266a052c00826e4c5df1011292baf09062 /lib/libpthread
parentMove sunkbd defn to common place and remove old event.c reference (diff)
downloadwireguard-openbsd-113e1ebb881a4e177614dc56d8806250d1b8f56b.tar.xz
wireguard-openbsd-113e1ebb881a4e177614dc56d8806250d1b8f56b.zip
Bye-bye libc_r. libc_r and libnpthread go away. libpthread
takes their place. The -pthread option to gcc uses libpthread. ppc portion of patch from drahn@ (thanks). gcc portions of patch OK espie@. Ports testing (no bad effects!) by naddy@ best build sequence is: build gcc, build system, build ports remove /usr/lib/lib{c_r,npthread}.*. Note, once libc_r and libnpthread is removed threaded ports will stop working until they have been re-built using the libpthread and the updated gcc. That's why the above build sequence is recommended.
Diffstat (limited to 'lib/libpthread')
-rw-r--r--lib/libpthread/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile
index c537c4eca97..b391e0098eb 100644
--- a/lib/libpthread/Makefile
+++ b/lib/libpthread/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2002/11/16 05:01:26 marc Exp $
+# $OpenBSD: Makefile,v 1.16 2003/01/14 20:04:44 marc Exp $
#
# The pthread library is formed from the FreeBSD uthread sources of
@@ -12,7 +12,7 @@ LIBCSRCDIR= ${.CURDIR}/../libc
.PATH: ${LIBC_RSRCDIR}
-LIB= npthread
+LIB= pthread
LINTFLAGS= -z
CFLAGS+= -DPTHREAD_KERNEL -D_POSIX_THREADS -D_THREAD_SAFE -Wall
CFLAGS+= -I${LIBC_RSRCDIR}/uthread
@@ -32,9 +32,7 @@ CFLAGS+= -D_PTHREADS_INVARIANTS
.include "${LIBC_RSRCDIR}/sys/Makefile.inc"
.include "${LIBC_RSRCDIR}/thread/Makefile.inc"
.include "${LIBC_RSRCDIR}/uthread/Makefile.inc"
-
-# XXX enable when libc_r is not built
-#.include "${LIBC_RSRCDIR}/man/Makefile.inc"
+.include "${LIBC_RSRCDIR}/man/Makefile.inc"
.include <bsd.own.mk>
.include <bsd.lib.mk>