diff options
| author | asau <asau> | 2009-11-10 23:31:36 +0000 |
|---|---|---|
| committer | asau <asau> | 2009-11-10 23:31:36 +0000 |
| commit | a8fd4ce78141a54705ce31e5afc74121394fb10e (patch) | |
| tree | 940b387339e5b72a208ceb8e8a11151106ab57f1 /devel/boehm-gc | |
| parent | 62f322bb421b884d7ab39c0e94ce6c7240452b42 (diff) | |
| download | pkgsrc-a8fd4ce78141a54705ce31e5afc74121394fb10e.tar.gz | |
Test for RTLD_DI_LINKMAP feature presence rather than for OS version.
Suggested by Tobias Nygren in private talk.
No revision change.
Diffstat (limited to 'devel/boehm-gc')
| -rw-r--r-- | devel/boehm-gc/distinfo | 4 | ||||
| -rw-r--r-- | devel/boehm-gc/patches/patch-ac | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo index 1e9c3f4f014..d94a743b198 100644 --- a/devel/boehm-gc/distinfo +++ b/devel/boehm-gc/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.37 2009/11/10 18:35:13 wiz Exp $ +$NetBSD: distinfo,v 1.38 2009/11/10 23:31:36 asau Exp $ SHA1 (gc-7.1.tar.gz) = e84cba5d18f4ea5ed4e5fd3f1dc6a46bc190ff6f RMD160 (gc-7.1.tar.gz) = 9338c1128686395739e3acd9052a651d1dffffb2 Size (gc-7.1.tar.gz) = 1077714 bytes SHA1 (patch-aa) = 87a5bd5e83b0201d80a1e4e4ce6745c11b2e7cfe SHA1 (patch-ab) = 9b5133c7aa84e6824616e29613716a2fedd1d334 -SHA1 (patch-ac) = 15a277053946b1f4c826e20549ad9656dffadc9c +SHA1 (patch-ac) = 82f869fc4f52a9936395a7f50240b81434f2cb42 diff --git a/devel/boehm-gc/patches/patch-ac b/devel/boehm-gc/patches/patch-ac index 592386b081b..e2ba1a28500 100644 --- a/devel/boehm-gc/patches/patch-ac +++ b/devel/boehm-gc/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.13 2009/11/10 18:35:13 wiz Exp $ +$NetBSD: patch-ac,v 1.14 2009/11/10 23:31:36 asau Exp $ ---- dyn_load.c.orig 2007-12-18 23:37:12.000000000 +0000 -+++ dyn_load.c -@@ -78,6 +78,8 @@ static int (*GC_has_static_roots)(const +--- dyn_load.c.orig 2007-12-19 02:37:12.000000000 +0300 ++++ dyn_load.c 2009-11-11 01:54:26.000000000 +0300 +@@ -78,6 +78,8 @@ #endif #if defined(NETBSD) @@ -11,11 +11,11 @@ $NetBSD: patch-ac,v 1.13 2009/11/10 18:35:13 wiz Exp $ # include <machine/elf_machdep.h> # define ELFSIZE ARCH_ELFSIZE #endif -@@ -499,6 +501,15 @@ GC_FirstDLOpenedLinkMap() +@@ -499,6 +501,15 @@ return(0); } if( cachedResult == 0 ) { -+#if defined(NETBSD) && defined(__NetBSD_Version__) && __NetBSD_Version__ >= 599001900 ++#if defined(NETBSD) && defined(RTLD_DI_LINKMAP) + struct link_map *lm = NULL; + int rv = dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &lm); + if (rv != 0) @@ -23,11 +23,11 @@ $NetBSD: patch-ac,v 1.13 2009/11/10 18:35:13 wiz Exp $ + if (lm == NULL) + return (0); + cachedResult = lm; -+#else /* !(defined(NETBSD) && __NetBSD_Version__ >= 599001900) */ ++#else /* !(defined(NETBSD) && defined(RTLD_DI_LINKMAP)) */ int tag; for( dp = _DYNAMIC; (tag = dp->d_tag) != 0; dp++ ) { if( tag == DT_DEBUG ) { -@@ -508,6 +519,7 @@ GC_FirstDLOpenedLinkMap() +@@ -508,6 +519,7 @@ break; } } |