diff options
| author | jlam <jlam> | 2004-11-26 17:42:42 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-11-26 17:42:42 +0000 |
| commit | a4321741e3810e59cb3ac59efa419f39b2380cfd (patch) | |
| tree | 143e690c41459ecc58063c0bdab59daf0970b399 /mk | |
| parent | 47cae405a744b8439fcaf26fffe03b910035c8b3 (diff) | |
| download | pkgsrc-a4321741e3810e59cb3ac59efa419f39b2380cfd.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/dlopen.builtin.mk | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/mk/dlopen.builtin.mk b/mk/dlopen.builtin.mk index 9cd8e7a9423..bc0c83b992b 100644 --- a/mk/dlopen.builtin.mk +++ b/mk/dlopen.builtin.mk @@ -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,19 +29,6 @@ USE_BUILTIN.dl= ${IS_BUILTIN.dl} USE_BUILTIN.dl= no # Darwin uses devel/dlcompat . endif .endif - -CHECK_BUILTIN.dl?= no -.if !empty(CHECK_BUILTIN.dl:M[nN][oO]) - -. if !empty(USE_BUILTIN.dl:M[yY][eE][sS]) -BUILDLINK_PREFIX.dl= /usr -. if !empty(_BLNK_LIB_FOUND.dl:M[yY][eE][sS]) -# -# No need to add this to BUILDLINK_LIBS.dl since most GNU configure -# scripts already check for -ldl themselves. -# -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 @@ -53,23 +40,36 @@ _DLOPEN_REQUIRE_PTHREAD_PLATFORMS= \ 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]) +.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 +. 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) +.if defined(DLOPEN_REQUIRE_PTHREADS) _DLOPEN_REQUIRE_PTHREADS:= ${DLOPEN_REQUIRE_PTHREADS} -. else +.else DLOPEN_REQUIRE_PTHREADS= ${_DLOPEN_REQUIRE_PTHREADS} +.endif + +CHECK_BUILTIN.dl?= no +.if !empty(CHECK_BUILTIN.dl:M[nN][oO]) + +. if !empty(USE_BUILTIN.dl:M[yY][eE][sS]) +BUILDLINK_PREFIX.dl= /usr +. if !empty(_BLNK_LIB_FOUND.dl:M[yY][eE][sS]) +# +# No need to add this to BUILDLINK_LIBS.dl since most GNU configure +# scripts already check for -ldl themselves. +# +BUILDLINK_LDADD.dl= -ldl . endif . if !empty(_DLOPEN_REQUIRE_PTHREADS:M[yY][eE][sS]) BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ |