diff options
| author | drochner <drochner@pkgsrc.org> | 2010-06-16 19:57:08 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2010-06-16 19:57:08 +0000 |
| commit | f0ddc07eb723cbee05ef69b8ab2d41c30a2764ba (patch) | |
| tree | a0f223b403dc4e9af67b10d5e359524bf2d7f4d4 /mk/dlopen.builtin.mk | |
| parent | f5d040f3b32961ce41503de7e71cf1410d85408e (diff) | |
| download | pkgsrc-f0ddc07eb723cbee05ef69b8ab2d41c30a2764ba.tar.gz | |
drop the rule that programs which use dlopen() must link against
libpthread -- it is generally under the program's control which modules
to load, a general rule is just too much
I've been using this modification for over a year without problems.
Diffstat (limited to 'mk/dlopen.builtin.mk')
| -rw-r--r-- | mk/dlopen.builtin.mk | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/mk/dlopen.builtin.mk b/mk/dlopen.builtin.mk index f8062ad2d8c..a0914af6445 100644 --- a/mk/dlopen.builtin.mk +++ b/mk/dlopen.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: dlopen.builtin.mk,v 1.20 2009/03/20 19:25:01 joerg Exp $ +# $NetBSD: dlopen.builtin.mk,v 1.21 2010/06/16 19:57:08 drochner Exp $ BUILTIN_PKG:= dl @@ -38,44 +38,6 @@ USE_BUILTIN.dl= no # Darwin-[56].* uses devel/dlcompat .endif MAKEVARS+= USE_BUILTIN.dl -# 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. -# It is not required for NetBSD>=5 if just linked with pthread or using -# pthread_mutex_*(), but need if using pthread_create() / pthread_join(). -# -_BLNK_DLOPEN_REQUIRE_PTHREAD_PLATFORMS= \ - NetBSD-2.[0-9]_*-* \ - NetBSD-2.[0-9]-* NetBSD-2.[0-9].[0-9]*-* \ - NetBSD-2.[0-8][0-9]*-* NetBSD-2.9[0-8]*-* \ - NetBSD-2.99.[0-9]-* NetBSD-2.99.10-* \ - NetBSD-[3-9]*-* \ - NetBSD-[1-9][0-9]*-* - -.if !defined(_BLNK_DLOPEN_REQUIRE_PTHREADS) -_BLNK_DLOPEN_REQUIRE_PTHREADS?= no -. for _pattern_ in ${_BLNK_DLOPEN_REQUIRE_PTHREAD_PLATFORMS} -. if !empty(MACHINE_PLATFORM:M${_pattern_}) -. if !empty(PREFER_NATIVE_PTHREADS:M[yY][eE][sS]) -_BLNK_DLOPEN_REQUIRE_PTHREADS= yes -. endif -. endif -. endfor -.endif -MAKEVARS+= _BLNK_DLOPEN_REQUIRE_PTHREADS -# -# 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) -_BLNK_DLOPEN_REQUIRE_PTHREADS:= ${DLOPEN_REQUIRE_PTHREADS} -.else -DLOPEN_REQUIRE_PTHREADS= ${_BLNK_DLOPEN_REQUIRE_PTHREADS} -.endif - ### ### The section below only applies if we are not including this file ### solely to determine whether a built-in implementation exists. @@ -92,13 +54,6 @@ BUILDLINK_PREFIX.dl= /usr # BUILDLINK_LDADD.dl= -ldl . endif -. if !empty(_BLNK_DLOPEN_REQUIRE_PTHREADS:M[yY][eE][sS]) -. include "../../mk/pthread.buildlink3.mk" -. include "../../mk/pthread.builtin.mk" -BUILDLINK_CFLAGS.dl+= ${PTHREAD_CFLAGS} -BUILDLINK_LDFLAGS.dl+= ${PTHREAD_LDFLAGS} -BUILDLINK_LIBS.dl+= ${PTHREAD_LIBS} -. endif . endif .endif # CHECK_BUILTIN.dl |