From owner-svn-src-all@FreeBSD.ORG  Mon Feb 15 14:14:14 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2CD231065693;
	Mon, 15 Feb 2010 14:14:14 +0000 (UTC) (envelope-from ru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1810E8FC16;
	Mon, 15 Feb 2010 14:14:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o1FEEDJV022836;
	Mon, 15 Feb 2010 14:14:13 GMT (envelope-from ru@svn.freebsd.org)
Received: (from ru@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1FEEDoT022833;
	Mon, 15 Feb 2010 14:14:13 GMT (envelope-from ru@svn.freebsd.org)
Message-Id: <201002151414.o1FEEDoT022833@svn.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Mon, 15 Feb 2010 14:14:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203918 - in head/lib: libc_r libkse
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Feb 2010 14:14:14 -0000

Author: ru
Date: Mon Feb 15 14:14:13 2010
New Revision: 203918
URL: http://svn.freebsd.org/changeset/base/203918

Log:
  Though these libraries are disconnected from the build and don't
  currently build, they should be kept.  [1]
  
  Unbreak their makefiles by removing the support for the long gone
  DEFAULT_THREAD_LIB knob.  (Allows the tools/make_libdeps.sh script
  to succeed.)
  
  According to:	davidxu and deischen [1]
  MFC after:	3 days

Modified:
  head/lib/libc_r/Makefile
  head/lib/libkse/Makefile

Modified: head/lib/libc_r/Makefile
==============================================================================
--- head/lib/libc_r/Makefile	Mon Feb 15 14:08:06 2010	(r203917)
+++ head/lib/libc_r/Makefile	Mon Feb 15 14:14:13 2010	(r203918)
@@ -10,10 +10,6 @@
 
 .include <bsd.own.mk>
 
-.if ${DEFAULT_THREAD_LIB} == "libc_r" && ${SHLIBDIR} == "/usr/lib"
-SHLIBDIR= /lib
-.endif
-
 LIB=c_r
 SHLIB_MAJOR= 7
 CFLAGS+=-DPTHREAD_KERNEL 
@@ -32,16 +28,4 @@ PRECIOUSLIB=
 .include "${.CURDIR}/uthread/Makefile.inc"
 .include "${.CURDIR}/sys/Makefile.inc"
 
-.if ${DEFAULT_THREAD_LIB} == "libc_r"
-.if ${MK_INSTALLLIB} != "no"
-SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
-.endif
-.if !defined(NO_PIC)
-SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
-.endif
-.if ${MK_PROFILE} != "no"
-SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
-.endif
-.endif
-
 .include <bsd.lib.mk>

Modified: head/lib/libkse/Makefile
==============================================================================
--- head/lib/libkse/Makefile	Mon Feb 15 14:08:06 2010	(r203917)
+++ head/lib/libkse/Makefile	Mon Feb 15 14:14:13 2010	(r203918)
@@ -10,15 +10,7 @@
 
 .include <bsd.own.mk>
 
-.if ${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no"
-LIB=kse
-.if ${SHLIBDIR} == "/usr/lib"
-SHLIBDIR= /lib
-.endif
-.else
 SHLIB=kse
-.endif
-
 SHLIB_MAJOR= 4
 CFLAGS+=-DPTHREAD_KERNEL
 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \
@@ -51,16 +43,4 @@ PRECIOUSLIB=
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
 
-.if ${DEFAULT_THREAD_LIB} == "libkse" || ${MK_LIBTHR} == "no"
-.if ${MK_INSTALLLIB} != "no"
-SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
-.endif
-.if !defined(NO_PIC)
-SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
-.endif
-.if ${MK_PROFILE} != "no"
-SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a
-.endif
-.endif
-
 .include <bsd.lib.mk>