From c8cd8ab0170a6a8afad06e2b3e6acaaeb9710d82 Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Fri, 27 Jun 2003 07:41:51 +0000
Subject: [PATCH] o  disconnect libc_r from the build on ia64. The library is
 now    obsolete. The intend is to add glue to either libthr or    libpthread
 to create the necessary compat links. o  Hook libpthread to the build on
 ia64. This is slightly out of    order, because the kernel still doesn't have
 all the support,    but that's not a problem in this case.

---
 lib/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/Makefile b/lib/Makefile
index 884e3103c064..ab5ae75b7ab9 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -40,9 +40,12 @@ _csu=csu/${MACHINE_ARCH}
 _csu=csu
 .endif
 
+# libc_r is obsolete on ia64.
+.if ${MACHINE_ARCH} != "ia64"
 .if !defined(NOLIBC_R)
 _libc_r=	libc_r
 .endif
+.endif
 
 .if !defined(NO_BIND)
 _libbind=	libbind
@@ -69,6 +72,9 @@ _libthr=	libthr
 .endif
 
 .if ${MACHINE_ARCH} == "ia64"
+.if !defined(NOLIBPTHREAD)
+_libpthread=	libpthread
+.endif
 .if !defined(NOLIBTHR)
 _libthr=	libthr
 .endif