diff options
| author | obrien <obrien@FreeBSD.org> | 2007-10-09 13:42:34 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2007-10-09 13:42:34 +0000 |
| commit | eb3f6a9e7473ee9d6e8016ce8d9cc1e8286bdd98 (patch) | |
| tree | c47a609d11ee2b49fc8234ffe6ee4e508318db84 /share | |
| parent | 8e21b1f738e3a7d52ec50aa5730787013a76a4d5 (diff) | |
| download | FreeBSD-src-eb3f6a9e7473ee9d6e8016ce8d9cc1e8286bdd98.zip FreeBSD-src-eb3f6a9e7473ee9d6e8016ce8d9cc1e8286bdd98.tar.gz | |
Repo copy libpthreads to libkse.
This introduces the WITHOUT_LIBKSE nob,
and changes WITHOUT_LIBPTHREADS to mean with neither threading libs.
Approved by: re(kensmith)
Diffstat (limited to 'share')
| -rw-r--r-- | share/man/man3/Makefile | 2 | ||||
| -rw-r--r-- | share/man/man5/src.conf.5 | 15 | ||||
| -rw-r--r-- | share/mk/bsd.compat.mk | 1 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 2 |
4 files changed, 16 insertions, 4 deletions
diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index fcc94ef..5ff093f 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -146,7 +146,7 @@ MLINKS+= tree.3 RB_EMPTY.3 \ tree.3 SPLAY_RIGHT.3 \ tree.3 SPLAY_ROOT.3 -.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no" +.if ${MK_LIBPTHREAD} != "no" && (${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no") PTHREAD_MAN= pthread.3 \ pthread_atfork.3 \ pthread_attr.3 \ diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 68c9457..3a38aef 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -379,10 +379,10 @@ support. On amd64, set to not build 32-bit library set and a .Nm ld-elf32.so.1 runtime linker. -.It Va WITHOUT_LIBPTHREAD -.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBPTHREAD,v 1.1 2006/03/21 07:50:50 ru Exp +.It Va WITHOUT_LIBKSE +.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBKSE,v 1.1 2006/03/21 07:50:50 obrien Exp Set to not build the -.Nm libpthread +.Nm libkse (M:N threading) library. .It Va WITHOUT_LIBTHR @@ -391,6 +391,15 @@ Set to not build the .Nm libthr (1:1 threading) library. +.It Va WITHOUT_LIBPTHREAD +.\" from FreeBSD: src/tools/build/options/WITHOUT_LIBPTHREAD,v 1.1 2006/03/21 07:50:50 ru Exp +Set to not build either of the +.Nm libpthread +providing libraries ( +.Nm libthr +(1:1) & +.Nm libkse +(M:N)). .It Va WITHOUT_LOCALES .\" from FreeBSD: src/tools/build/options/WITHOUT_LOCALES,v 1.1 2006/03/21 07:50:50 ru Exp Set to not build localization files; see diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index dfa5dfc..5c3a875 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -16,6 +16,7 @@ NOINFOCOMPRESS:NO_INFOCOMPRESS \ NOINSTALLLIB:NO_INSTALLLIB \ NOLIBPTHREAD:NO_LIBPTHREAD \ + NOLIBKSE:NO_LIBKSE \ NOLIBTHR:NO_LIBTHR \ NOLINT:NO_LINT \ NOMAN:NO_MAN \ diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index b3f431b..92f3b3b 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -239,6 +239,7 @@ WITHOUT_${var}= KERBEROS \ LIB32 \ LIBPTHREAD \ + LIBKSE \ LIBTHR \ LOCALES \ LPR \ @@ -328,6 +329,7 @@ WITH_IDEA= KVM \ LIB32 \ LIBPTHREAD \ + LIBKSE \ LIBTHR \ LOCALES \ LPR \ |
