diff options
| author | jlam <jlam@pkgsrc.org> | 2004-11-12 22:34:15 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-11-12 22:34:15 +0000 |
| commit | ea4f48414e84cdec65be3f08f48fb064fa62ecd0 (patch) | |
| tree | cc9032fcb698d9e9af994a654864ae1732a782f4 | |
| parent | 3c9a6a9ce855b23715da0b865201994d70380deb (diff) | |
| download | pkgsrc-ea4f48414e84cdec65be3f08f48fb064fa62ecd0.tar.gz | |
Move PREFER_NATIVE_PTHREADS default setting to from pthread.buildlink3.mk
to defaults/mk.conf, where all defaults should live.
| -rw-r--r-- | mk/defaults/mk.conf | 7 | ||||
| -rw-r--r-- | mk/pthread.buildlink3.mk | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 0b6e2118184..aa849691d88 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.12 2004/11/05 13:46:39 wiz Exp $ +# $NetBSD: mk.conf,v 1.13 2004/11/12 22:34:15 jlam Exp $ # # A file providing defaults for pkgsrc and the packages collection. @@ -148,6 +148,11 @@ PREFER_NATIVE?= yes # # Possible: yes, no, or a list of packages +PREFER_NATIVE_PTHREADS?= yes +# This toggles whether we prefer using the native pthreads implementation +# or the pkgsrc OPR (see pthread.buildlink3.mk). This setting is +# independent of the PREFER_* variables named above. + #WRKOBJDIR= /usr/tmp # build here instead of in pkgsrc # Possible: any path diff --git a/mk/pthread.buildlink3.mk b/mk/pthread.buildlink3.mk index 0b4640a7145..34c4259e94b 100644 --- a/mk/pthread.buildlink3.mk +++ b/mk/pthread.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: pthread.buildlink3.mk,v 1.15 2004/11/12 06:39:20 jlam Exp $ +# $NetBSD: pthread.buildlink3.mk,v 1.16 2004/11/12 22:34:15 jlam Exp $ # # The pthreads strategy for pkgsrc is to "bless" a particular pthread # package as the Official Pthread Replacement (OPR). A package that uses @@ -117,7 +117,6 @@ PTHREAD_OPTS?= # empty # of /usr/include/pthread.h (we might want to make this check stricter). # .undef PTHREAD_TYPE -PREFER_NATIVE_PTHREADS?= YES .if exists(/usr/include/pthread.h) && \ !empty(PREFER_NATIVE_PTHREADS:M[yY][eE][sS]) PTHREAD_TYPE= native |