summaryrefslogtreecommitdiff
path: root/shells/bash2
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2000-02-24 23:04:06 +0000
committertron <tron@pkgsrc.org>2000-02-24 23:04:06 +0000
commit940e7183817e88f872b9834cf21a9ab629edc223 (patch)
treead388398e446ac6bb1134fc228c6971135d37082 /shells/bash2
parentd27ae9fd62c3ecaaf92bb71d82a1d8602738357f (diff)
downloadpkgsrc-940e7183817e88f872b9834cf21a9ab629edc223.tar.gz
Fix loading from shared libraries on ELF systems. Patch provided by
John Darrow in PR pkg/9481.
Diffstat (limited to 'shells/bash2')
-rw-r--r--shells/bash2/files/patch-sum4
-rw-r--r--shells/bash2/patches/patch-ae13
2 files changed, 10 insertions, 7 deletions
diff --git a/shells/bash2/files/patch-sum b/shells/bash2/files/patch-sum
index 4f132fccd1d..5dba1d8e918 100644
--- a/shells/bash2/files/patch-sum
+++ b/shells/bash2/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:05 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/02/24 23:04:06 tron Exp $
MD5 (patch-aa) = f9578af0984d6a3979cf301ffa4df2d3
MD5 (patch-ab) = d40900b85f7bba316fb1ab582273ac78
MD5 (patch-ac) = 557451c3fd9e0b5c1fbc139e9feffc93
-MD5 (patch-ae) = abcf09814d8164458700980c251811be
+MD5 (patch-ae) = 39535a6d53bf4ef794e74563be965816
diff --git a/shells/bash2/patches/patch-ae b/shells/bash2/patches/patch-ae
index ebfacf19135..555907bd60b 100644
--- a/shells/bash2/patches/patch-ae
+++ b/shells/bash2/patches/patch-ae
@@ -1,18 +1,21 @@
-$NetBSD: patch-ae,v 1.3 1998/08/07 11:13:53 agc Exp $
+$NetBSD: patch-ae,v 1.4 2000/02/24 23:04:07 tron Exp $
--- builtins/enable.def.orig Fri Jul 18 15:55:00 1997
+++ builtins/enable.def Tue Aug 4 21:18:05 1998
-@@ -290,9 +290,10 @@
+@@ -290,9 +290,16 @@
name = list->word->word;
size = strlen (name);
-- struct_name = xmalloc (size + 8);
-- strcpy (struct_name, name);
-- strcpy (struct_name + size, "_struct");
++#ifdef __ELF__
+ struct_name = xmalloc (size + 8);
+ strcpy (struct_name, name);
+ strcpy (struct_name + size, "_struct");
++#else
+ struct_name = xmalloc (size + 9);
+ *struct_name = '_';
+ strcpy (struct_name + 1, name);
+ strcpy (struct_name + size + 1, "_struct");
++#endif
b = (struct builtin *)dlsym (handle, struct_name);
if (b == 0)