[pkgsrc/trunk]: pkgsrc/mk Move all dlopen-handling code into dlopen.{builtin,...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5efb343b8d14
branches:  trunk
changeset: 484213:5efb343b8d14
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Nov 26 08:15:25 2004 +0000

description:
Move all dlopen-handling code into dlopen.{builtin,buildlink3}.mk.

diffstat:

 mk/bsd.pkg.mk        |  10 +---------
 mk/dlopen.builtin.mk |   8 +++++---
 2 files changed, 6 insertions(+), 12 deletions(-)

diffs (52 lines):

diff -r b6b37f6a64f5 -r 5efb343b8d14 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Nov 26 08:12:59 2004 +0000
+++ b/mk/bsd.pkg.mk     Fri Nov 26 08:15:25 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1542 2004/11/25 22:02:49 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1543 2004/11/26 08:15:25 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -339,14 +339,6 @@
 .  endif     # !defined(PERL5_*)
 .endif       # USE_PERL5 == run
 
-# _DLOPEN_REQUIRE_PTHREADS is defined by dlopen.buildlink3.mk.
-.if defined(_DLOPEN_REQUIRE_PTHREADS) && \
-    !empty(_DLOPEN_REQUIRE_PTHREADS:M[yY][eE][sS])
-.  if !empty(USE_BUILDLINK3:M[yY][eE][sS])
-.    include "../../mk/pthread.buildlink3.mk"
-.  endif
-.endif
-
 .if defined(USE_FORTRAN)
 .  if !exists(/usr/bin/f77)
 PKG_FC?=               f2c-f77
diff -r b6b37f6a64f5 -r 5efb343b8d14 mk/dlopen.builtin.mk
--- a/mk/dlopen.builtin.mk      Fri Nov 26 08:12:59 2004 +0000
+++ b/mk/dlopen.builtin.mk      Fri Nov 26 08:15:25 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dlopen.builtin.mk,v 1.1 2004/11/26 07:05:19 jlam Exp $
+# $NetBSD: dlopen.builtin.mk,v 1.2 2004/11/26 08:15:25 jlam Exp $
 
 .for _lib_ in dl
 .  if !defined(_BLNK_LIB_FOUND.${_lib_})
@@ -62,14 +62,16 @@
 #      included or not.  Its default value depends on whether native
 #      pthreads exist.
 #
-# Including pthread.buildlink3.mk is deferred until bsd.pkg.mk.
-#
 .    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"
+BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
+.      include "../../mk/pthread.builtin.mk"
 BUILDLINK_CFLAGS.dl+=  ${PTHREAD_CFLAGS}
 BUILDLINK_LDFLAGS.dl+= ${PTHREAD_LDFLAGS}
 BUILDLINK_LIBS.dl+=    ${PTHREAD_LIBS}