summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2000-12-05 15:03:52 +0000
committerdrochner <drochner@pkgsrc.org>2000-12-05 15:03:52 +0000
commite5d4d33cb28487eb619a9df648d22909c0ca5e7e (patch)
treee8fe8800e26745dddf4067c8e43155761f4bb17c
parent86c97d8f47cf66c983a27a661b27a250451e80ec (diff)
downloadpkgsrc-e5d4d33cb28487eb619a9df648d22909c0ca5e7e.tar.gz
fix reporting of dynamic linking errors
-rw-r--r--lang/python/files/patch-sum4
-rw-r--r--lang/python/patches/patch-aa32
2 files changed, 22 insertions, 14 deletions
diff --git a/lang/python/files/patch-sum b/lang/python/files/patch-sum
index 1296ec9df18..fff100b5f23 100644
--- a/lang/python/files/patch-sum
+++ b/lang/python/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.4 2000/11/11 17:08:52 tsarna Exp $
+$NetBSD: patch-sum,v 1.5 2000/12/05 15:03:52 drochner Exp $
-MD5 (patch-aa) = ba00c16db003d1a32ba101aed8ec5494
+MD5 (patch-aa) = d34bb356a4a1c387cb088c99cdc7dff5
diff --git a/lang/python/patches/patch-aa b/lang/python/patches/patch-aa
index c54415761af..da7a2719668 100644
--- a/lang/python/patches/patch-aa
+++ b/lang/python/patches/patch-aa
@@ -1,25 +1,33 @@
-$NetBSD: patch-aa,v 1.7 2000/11/11 17:08:16 tsarna Exp $
+$NetBSD: patch-aa,v 1.8 2000/12/05 15:03:52 drochner Exp $
-Make this work on non-ELF NetBSD.
-Based on current python cvs with (probably broken... are ALL OpenBSD
-ports a.out?) + NetBSD fix.
-
---- Python/dynload_shlib.c.orig Sat Nov 11 10:32:40 2000
-+++ Python/dynload_shlib.c Sat Nov 11 10:51:03 2000
-@@ -16,6 +16,12 @@
+--- Python/dynload_shlib.c.orig Mon Oct 16 23:49:29 2000
++++ Python/dynload_shlib.c Tue Dec 5 15:58:49 2000
+@@ -6,7 +6,9 @@
+
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#if defined(__NetBSD__) && (NetBSD < 199712)
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#if (NetBSD < 199712)
+ #include <nlist.h>
+ #include <link.h>
+ #define dlerror() "error in dynamic linking"
+@@ -15,6 +17,13 @@
+ #include <dlfcn.h>
#endif
#endif
-
++#endif /* __NetBSD__ */
++
+#if (defined(__NetBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)
+#define LEAD_UNDERSCORE "_"
+#else
+#define LEAD_UNDERSCORE ""
+#endif
-+
+
#ifndef RTLD_LAZY
#define RTLD_LAZY 1
- #endif
-@@ -55,7 +61,7 @@
+@@ -55,7 +64,7 @@
}
/* ### should there be a leading underscore for some platforms? */