diff options
| author | jlam <jlam@pkgsrc.org> | 2004-11-26 08:15:25 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-11-26 08:15:25 +0000 |
| commit | b47bc866c03bce0c0b620651294ca41350e92f30 (patch) | |
| tree | f7b3dda102e9b6731e6f921e0f5bf73045a7fbfa /mk | |
| parent | 399f4ba496ba3855c2d065c322f437812d31b719 (diff) | |
| download | pkgsrc-b47bc866c03bce0c0b620651294ca41350e92f30.tar.gz | |
Move all dlopen-handling code into dlopen.{builtin,buildlink3}.mk.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 | ||||
| -rw-r--r-- | mk/dlopen.builtin.mk | 8 |
2 files changed, 6 insertions, 12 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index bcd14e8d387..f767933c2fa 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 @@ MAKEFLAGS+= PERL5_ARCHLIB=${PERL5_ARCHLIB:Q} . 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 --git a/mk/dlopen.builtin.mk b/mk/dlopen.builtin.mk index 09600d6b6d2..9b9478c45d3 100644 --- a/mk/dlopen.builtin.mk +++ b/mk/dlopen.builtin.mk @@ -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 @@ _DLOPEN_REQUIRE_PTHREADS= yes # 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} |