From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Sat, 15 Dec 2007 07:13:18 +0000 (+0000)
Subject: Unbreak buildworld:
X-Git-Tag: v2.0.1~1617
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/26c2c67b605035e7d6b736ae53865322c77fdec2

Unbreak buildworld:
- Add libthread_xu to prebuilding libraries in top level Makefile.inc1.
- Put libthread_xu before libpthread in lib/Makefile, add comment about it.
- Fix typo in lib/libpthread/Makefile
- Add XXX-commented out DPADD in lib/libpthread/Makefile; a more 'complete'
  solution for the default thread library naming is needed.
---

diff --git a/Makefile.inc1 b/Makefile.inc1
index 4f94a8b6e1..fe8f1bfae4 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,6 +1,6 @@
 #
 # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
-# $DragonFly: src/Makefile.inc1,v 1.109 2007/11/18 17:53:01 pavalos Exp $
+# $DragonFly: src/Makefile.inc1,v 1.110 2007/12/15 07:13:18 sephe Exp $
 #
 # Build-time options are documented in make.conf(5).
 #
@@ -927,7 +927,7 @@ _generic_libs+=	kerberos5/lib
 _prebuild_libs+= lib/libcom_err lib/libcrypt lib/libmd \
 		lib/libncurses/libncurses lib/libopie lib/libradius \
 		lib/libsbuf lib/libskey lib/libtacplus lib/libz lib/libm \
-		lib/libpam lib/libc_r
+		lib/libpam lib/libc_r lib/libthread_xu
 
 lib/libopie__L lib/libradius__L lib/libtacplus__L: lib/libmd__L
 lib/libskey__L: lib/libcrypt__L lib/libmd__L
diff --git a/lib/Makefile b/lib/Makefile
index 389dfb80b5..44acdf4603 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,6 +1,6 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 # $FreeBSD: src/lib/Makefile,v 1.107.2.16 2002/10/10 19:24:35 kbyanc Exp $
-# $DragonFly: src/lib/Makefile,v 1.30 2007/05/17 21:09:47 dillon Exp $
+# $DragonFly: src/lib/Makefile,v 1.31 2007/12/15 07:13:18 sephe Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:
@@ -16,6 +16,8 @@
 # libtacplus must be built before libpam.
 # libutil must be built before libpam.
 # libsbuf must be built before libcam.
+# libthread_xu must be built before libpthread.
+# ${_libc_r} must be built before libpthread.
 #
 # Otherwise, the SUBDIR list should be in alphabetical order.
 
@@ -25,8 +27,8 @@ SUBDIR=	libarchive libcom_err libcrypt libm libmd \
 	libcalendar libcam libcompat libdevstat libedit libfetch \
 	libftpio libipsec libipx libisc libkcore libkinfo libkvm libmagic \
 	${_libmilter} ${_libncp} libnetgraph libopie libpam \
-	libpcap libposix1e libpthread librpcsvc ${_libsm} ${_libsmb} \
-	${_libsmdb} ${_libsmutil} libstand libtelnet libthread_xu libusbhid \
+	libpcap libposix1e libthread_xu libpthread librpcsvc ${_libsm} \
+	${_libsmb} ${_libsmdb} ${_libsmutil} libstand libtelnet libusbhid \
 	${_libvgl} libwrap libxpg4 liby libz i18n_module pam_module \
 	libc_rtld libsctp
 
diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile
index e76b726da3..153621d5a9 100644
--- a/lib/libpthread/Makefile
+++ b/lib/libpthread/Makefile
@@ -1,10 +1,12 @@
-# $DragonFly: src/lib/libpthread/Makefile,v 1.3 2007/12/14 20:27:14 corecode Exp $
+# $DragonFly: src/lib/libpthread/Makefile,v 1.4 2007/12/15 07:13:18 sephe Exp $
 
 LIBNAME=	libpthread
 SHLIB_MAJOR=	0
 SHLIB_NAME=	${LIBNAME}.so
 SONAME=		${SHLIB_NAME}.${SHLIB_MAJOR}
-DEFAULT_PTHREAD_LIB?=	libthread_xu
+DEFAULT_PTHREAD_LIB?=	thread_xu
+# XXX
+#DPADD=		${DESTDIR}${LIBDIR}/lib${DEFAULT_PTHREAD_LIB}.a
 LDADD=		-l${DEFAULT_PTHREAD_LIB}	# or any lib defining the pthread interface
 
 SRCS=		dummy.c