diff options
| author | minskim <minskim@pkgsrc.org> | 2005-06-26 13:11:22 +0000 |
|---|---|---|
| committer | minskim <minskim@pkgsrc.org> | 2005-06-26 13:11:22 +0000 |
| commit | af252c5f04d899387c02b4006603933834b20ccc (patch) | |
| tree | 997ee14587d1de5f3b060a924107a41304c110fa /mk | |
| parent | c0ff2e2f8d104f6e267f603eb71417250d67e042 (diff) | |
| download | pkgsrc-af252c5f04d899387c02b4006603933834b20ccc.tar.gz | |
Darwin>=7.0 does not need devel/dlcompat.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/dlopen.buildlink3.mk | 4 | ||||
| -rw-r--r-- | mk/dlopen.builtin.mk | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mk/dlopen.buildlink3.mk b/mk/dlopen.buildlink3.mk index ca35c6cc2e7..b7f29e659e7 100644 --- a/mk/dlopen.buildlink3.mk +++ b/mk/dlopen.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: dlopen.buildlink3.mk,v 1.8 2004/11/26 09:32:06 jlam Exp $ +# $NetBSD: dlopen.buildlink3.mk,v 1.9 2005/06/26 13:11:22 minskim Exp $ # # This Makefile fragment is included by package Makefiles and # buildlink3.mk files for the packages that use dlopen(). @@ -20,7 +20,7 @@ BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Ndl} BUILDLINK_PACKAGES+= dl BUILDLINK_BUILTIN_MK.dl= ../../mk/dlopen.builtin.mk BUILDLINK_AUTO_VARS.dl= ${DL_AUTO_VARS} -.elif ${OPSYS} == "Darwin" +.elif !empty(MACHINE_PLATFORM:MDarwin-[56].*) . include "../../devel/dlcompat/buildlink3.mk" BUILDLINK_AUTO_VARS.dlcompat= ${DL_AUTO_VARS} .else diff --git a/mk/dlopen.builtin.mk b/mk/dlopen.builtin.mk index 655d1ed107b..16c77b3ba83 100644 --- a/mk/dlopen.builtin.mk +++ b/mk/dlopen.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: dlopen.builtin.mk,v 1.13 2005/06/09 05:59:51 jlam Exp $ +# $NetBSD: dlopen.builtin.mk,v 1.14 2005/06/26 13:11:22 minskim Exp $ BUILTIN_PKG:= dl @@ -27,13 +27,13 @@ MAKEVARS+= IS_BUILTIN.dl ### # # We ignore the value of PREFER_PKGSRC and PREFER_NATIVE because for -# every platform except for Darwin, we can only use the built-in +# every platform except for Darwin-[56].*, we can only use the built-in # dynamic linker functions, so USE_BUILTIN.dl must match IS_BUILTIN.dl. # .if !defined(USE_BUILTIN.dl) USE_BUILTIN.dl= ${IS_BUILTIN.dl} -. if ${OPSYS} == "Darwin" -USE_BUILTIN.dl= no # Darwin uses devel/dlcompat +. if !empty(MACHINE_PLATFORM:MDarwin-[56].*) +USE_BUILTIN.dl= no # Darwin-[56].* uses devel/dlcompat . endif .endif MAKEVARS+= USE_BUILTIN.dl |