[pkgsrc/trunk]: pkgsrc/mk Move PREFER_NATIVE_PTHREADS default setting to from...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ac14c150263
branches:  trunk
changeset: 483488:6ac14c150263
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Nov 12 22:34:15 2004 +0000

description:
Move PREFER_NATIVE_PTHREADS default setting to from pthread.buildlink3.mk
to defaults/mk.conf, where all defaults should live.

diffstat:

 mk/defaults/mk.conf      |  7 ++++++-
 mk/pthread.buildlink3.mk |  3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r 0a28dd550390 -r 6ac14c150263 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Fri Nov 12 22:10:16 2004 +0000
+++ b/mk/defaults/mk.conf       Fri Nov 12 22:34:15 2004 +0000
@@ -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 @@
 #
 # 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 -r 0a28dd550390 -r 6ac14c150263 mk/pthread.buildlink3.mk
--- a/mk/pthread.buildlink3.mk  Fri Nov 12 22:10:16 2004 +0000
+++ b/mk/pthread.buildlink3.mk  Fri Nov 12 22:34:15 2004 +0000
@@ -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 @@
 # 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