[pkgsrc/trunk]: pkgsrc/mk Move the section that defines DLOPEN_REQUIRE_PTHREA...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2870294c533c
branches:  trunk
changeset: 484255:2870294c533c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Nov 26 17:42:42 2004 +0000

description:
Move the section that defines DLOPEN_REQUIRE_PTHREAD outside of the
CHECK_BUILTIN.dl-protected section so that it's value can be usd after
dlopen.buildlink3.mk is included.  This should fix PR pkg/28422.

diffstat:

 mk/dlopen.builtin.mk |  60 ++++++++++++++++++++++++++--------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)

diffs (81 lines):

diff -r 8ab0ce3022fa -r 2870294c533c mk/dlopen.builtin.mk
--- a/mk/dlopen.builtin.mk      Fri Nov 26 17:22:54 2004 +0000
+++ b/mk/dlopen.builtin.mk      Fri Nov 26 17:42:42 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dlopen.builtin.mk,v 1.3 2004/11/26 08:26:51 jlam Exp $
+# $NetBSD: dlopen.builtin.mk,v 1.4 2004/11/26 17:42:42 jlam Exp $
 
 .for _lib_ in dl
 .  if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -29,6 +29,35 @@
 USE_BUILTIN.dl=                no      # Darwin uses devel/dlcompat
 .  endif
 .endif
+#
+# The following platforms require pthreads to be linked into the
+# application if it uses dlopen() or else the applications will core
+# dump when they dlopen a shared module that _is_ linked with pthread
+# support.
+#
+_DLOPEN_REQUIRE_PTHREAD_PLATFORMS=                                     \
+       NetBSD-2.[0-9]-* NetBSD-2.[0-8][0-9]*-* NetBSD-2.9[0-8]*-*      \
+       NetBSD-2.99.[0-9]-* NetBSD-2.99.10-*
+
+_DLOPEN_REQUIRE_PTHREADS?=     no
+.for _pattern_ in ${_DLOPEN_REQUIRE_PTHREAD_PLATFORMS}
+.  if !empty(MACHINE_PLATFORM:M${_pattern_})
+.    if !empty(PREFER_NATIVE_PTHREADS:M[yY][eE][sS])
+_DLOPEN_REQUIRE_PTHREADS=      yes
+.    endif
+.  endif
+.endfor
+#
+# DLOPEN_REQUIRE_PTHREADS is a user- and package-settable yes/no variable
+#      whose value decides whether pthread.buildlink3.mk is automatically
+#      included or not.  Its default value depends on whether native
+#      pthreads exist.
+#
+.if defined(DLOPEN_REQUIRE_PTHREADS)
+_DLOPEN_REQUIRE_PTHREADS:=      ${DLOPEN_REQUIRE_PTHREADS}
+.else
+DLOPEN_REQUIRE_PTHREADS=        ${_DLOPEN_REQUIRE_PTHREADS}
+.endif
 
 CHECK_BUILTIN.dl?=     no
 .if !empty(CHECK_BUILTIN.dl:M[nN][oO])
@@ -42,35 +71,6 @@
 #
 BUILDLINK_LDADD.dl=    -ldl
 .    endif
-#
-# The following platforms require pthreads to be linked into the
-# application if it uses dlopen() or else the applications will core
-# dump when they dlopen a shared module that _is_ linked with pthread
-# support.
-#
-_DLOPEN_REQUIRE_PTHREAD_PLATFORMS=                                     \
-       NetBSD-2.[0-9]-* NetBSD-2.[0-8][0-9]*-* NetBSD-2.9[0-8]*-*      \
-       NetBSD-2.99.[0-9]-* NetBSD-2.99.10-*
-
-_DLOPEN_REQUIRE_PTHREADS?=     no
-.    for _pattern_ in ${_DLOPEN_REQUIRE_PTHREAD_PLATFORMS}
-.      if !empty(MACHINE_PLATFORM:M${_pattern_})
-.        if !empty(PREFER_NATIVE_PTHREADS:M[yY][eE][sS])
-_DLOPEN_REQUIRE_PTHREADS=      yes
-.        endif
-.      endif
-.    endfor
-#
-# DLOPEN_REQUIRE_PTHREADS is a user- and package-settable yes/no variable
-#      whose value decides whether pthread.buildlink3.mk is automatically
-#      included or not.  Its default value depends on whether native
-#      pthreads exist.
-#
-.    if defined(DLOPEN_REQUIRE_PTHREADS)
-_DLOPEN_REQUIRE_PTHREADS:=      ${DLOPEN_REQUIRE_PTHREADS}
-.    else
-DLOPEN_REQUIRE_PTHREADS=        ${_DLOPEN_REQUIRE_PTHREADS}
-.    endif
 .    if !empty(_DLOPEN_REQUIRE_PTHREADS:M[yY][eE][sS])
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 .      include "../../mk/pthread.buildlink3.mk"