diff options
author | marcel <marcel@FreeBSD.org> | 2003-09-27 23:27:19 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2003-09-27 23:27:19 +0000 |
commit | 4d437893acf3013d5a155cc5d793fb32ee5e02d5 (patch) | |
tree | fac7df1d88314a174a75b5cd3603b110d7a570dd | |
parent | 186d3de8bf849b1f6ead4c671eaee1fcb27fbd66 (diff) | |
download | FreeBSD-src-4d437893acf3013d5a155cc5d793fb32ee5e02d5.zip FreeBSD-src-4d437893acf3013d5a155cc5d793fb32ee5e02d5.tar.gz |
Relink libc_r.a, libc_r.so and libc_r_p.so from libthr to libkse.
On ia64, where there's no libc_r at all, libkse is now the default
thread library by virtue of these links.
The reasons for this change are:
1. libkse is slated to become the default thread library anyway,
2. active development and maintenance is only present for libkse,
3. GNOME and KDE, both in the process of being supported on ia64,
work better with KSE; even on ia64.
-rw-r--r-- | lib/libkse/Makefile | 12 | ||||
-rw-r--r-- | lib/libpthread/Makefile | 12 | ||||
-rw-r--r-- | lib/libthr/Makefile | 12 |
3 files changed, 24 insertions, 12 deletions
diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile index 3d7c890..38711b2 100644 --- a/lib/libkse/Makefile +++ b/lib/libkse/Makefile @@ -38,4 +38,16 @@ PRECIOUSLIB= yes .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" +.if !defined(NOLIBC_R) +.if ${MACHINE_ARCH} == "ia64" +SYMLINKS+=lib${LIB}.a ${LIBDIR}/libc_r.a +.if !defined(NOPIC) +SYMLINKS+=lib${LIB}.so ${SHLIBDIR}/libc_r.so +.endif +.if !defined(NOPROFILE) +SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libc_r_p.a +.endif +.endif +.endif + .include <bsd.lib.mk> diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile index 3d7c890..38711b2 100644 --- a/lib/libpthread/Makefile +++ b/lib/libpthread/Makefile @@ -38,4 +38,16 @@ PRECIOUSLIB= yes .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" +.if !defined(NOLIBC_R) +.if ${MACHINE_ARCH} == "ia64" +SYMLINKS+=lib${LIB}.a ${LIBDIR}/libc_r.a +.if !defined(NOPIC) +SYMLINKS+=lib${LIB}.so ${SHLIBDIR}/libc_r.so +.endif +.if !defined(NOPROFILE) +SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libc_r_p.a +.endif +.endif +.endif + .include <bsd.lib.mk> diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index bd48b9a..caee9b7 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -25,16 +25,4 @@ WARNS?= 2 .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" -.if !defined(NOLIBC_R) -.if ${MACHINE_ARCH} == "ia64" -SYMLINKS+=libthr.a ${LIBDIR}/libc_r.a -.if !defined(NOPIC) -SYMLINKS+=libthr.so ${SHLIBDIR}/libc_r.so -.endif -.if !defined(NOPROFILE) -SYMLINKS+=libthr_p.a ${LIBDIR}/libc_r_p.a -.endif -.endif -.endif - .include <bsd.lib.mk> |