Date: Thu, 18 Feb 2010 16:52:49 +0000 (UTC) From: Ruslan Ermilov <ru@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r204048 - in stable/8/lib: libc_r libkse Message-ID: <201002181652.o1IGqnqR022408@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ru Date: Thu Feb 18 16:52:49 2010 New Revision: 204048 URL: http://svn.freebsd.org/changeset/base/204048 Log: MFC: r203918: Unbreak makefiles by removing mentions of DEFAULT_THREAD_LIB. Modified: stable/8/lib/libc_r/Makefile stable/8/lib/libkse/Makefile Directory Properties: stable/8/lib/libc_r/ (props changed) stable/8/lib/libkse/ (props changed) Modified: stable/8/lib/libc_r/Makefile ============================================================================== --- stable/8/lib/libc_r/Makefile Thu Feb 18 16:25:38 2010 (r204047) +++ stable/8/lib/libc_r/Makefile Thu Feb 18 16:52:49 2010 (r204048) @@ -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: stable/8/lib/libkse/Makefile ============================================================================== --- stable/8/lib/libkse/Makefile Thu Feb 18 16:25:38 2010 (r204047) +++ stable/8/lib/libkse/Makefile Thu Feb 18 16:52:49 2010 (r204048) @@ -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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002181652.o1IGqnqR022408>