kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

drop the rule that programs which use dlopen() must link against

Browse source 
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.
This commit is contained in:
drochner 2010-06-16 19:57:08 +00:00
parent 0642bfd245
commit dc1fd85ac3
1 changed files with 1 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
mk/dlopen.builtin.mk
View file

@ -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