pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Use pthread.builtin.mk to do builtin checks rather ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/97a54d0a6f28
branches:  trunk
changeset: 626108:97a54d0a6f28
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Nov 01 12:19:29 2013 +0000

description:
Use pthread.builtin.mk to do builtin checks rather than performing our
own version.

diffstat:

 mk/pthread.buildlink3.mk |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r f0468d6617f7 -r 97a54d0a6f28 mk/pthread.buildlink3.mk
--- a/mk/pthread.buildlink3.mk  Fri Nov 01 11:58:48 2013 +0000
+++ b/mk/pthread.buildlink3.mk  Fri Nov 01 12:19:29 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink3.mk,v 1.29 2010/02/06 11:06:19 obache Exp $
+# $NetBSD: pthread.buildlink3.mk,v 1.30 2013/11/01 12:19:29 jperkin Exp $
 #
 # The pthreads strategy for pkgsrc is to "bless" a particular pthread
 # package as the Official Pthread Replacement (OPR).  The following
@@ -82,12 +82,18 @@
 .include "../../mk/bsd.fast.prefs.mk"
 
 PTHREAD_OPTS?= # empty
+
+CHECK_BUILTIN.pthread:=  yes
+.include "../../mk/pthread.builtin.mk"
+CHECK_BUILTIN.pthread:=  no
+
 #
-# We check for a native pthreads implementation by checking for the presence
-# of /usr/include/pthread.h (we might want to make this check stricter).
+# Set the value of PTHREAD_TYPE depending on the platform and what's
+# available in the base system.
 #
 .undef PTHREAD_TYPE
-.if (exists(/usr/include/pthread.h) || ${OPSYS} == "Haiku") && \
+.if defined(USE_BUILTIN.pthread) && \
+    !empty(USE_BUILTIN.pthread:M[yY][eE][sS]) && \
     !empty(PREFER_NATIVE_PTHREADS:M[yY][eE][sS])
 PTHREAD_TYPE=  native
 .else



Home | Main Index | Thread Index | Old Index