diff options
| author | jlam <jlam@pkgsrc.org> | 2000-07-12 20:08:11 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2000-07-12 20:08:11 +0000 |
| commit | 32e83de61f6633cef2ae28bfc68cddfd0dfb9d01 (patch) | |
| tree | d657191ffffdbd3a8d65de4878c7a7e010374742 /lang | |
| parent | ce3044ed3a8c139e6ece59f5b5b08228e764d6ba (diff) | |
| download | pkgsrc-32e83de61f6633cef2ae28bfc68cddfd0dfb9d01.tar.gz | |
Make this package work under ELF.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/expect/files/patch-sum | 4 | ||||
| -rw-r--r-- | lang/expect/patches/patch-aa | 24 |
2 files changed, 22 insertions, 6 deletions
diff --git a/lang/expect/files/patch-sum b/lang/expect/files/patch-sum index 90179b54922..bd02d0acb4f 100644 --- a/lang/expect/files/patch-sum +++ b/lang/expect/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 13:54:07 agc Exp $ +$NetBSD: patch-sum,v 1.2 2000/07/12 20:08:11 jlam Exp $ -MD5 (patch-aa) = 7a15ac311adca459ad07efa558cc365a +MD5 (patch-aa) = 4abaa3904d4becb8d4bb3026d120513c MD5 (patch-ab) = e4ab205d79278be1e0823641728d1113 MD5 (patch-ac) = 4e2cba0d36690388cc0353deb6155cb7 diff --git a/lang/expect/patches/patch-aa b/lang/expect/patches/patch-aa index 5a89c17714a..3c41c4a3599 100644 --- a/lang/expect/patches/patch-aa +++ b/lang/expect/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.2 1998/08/07 11:08:57 agc Exp $ +$NetBSD: patch-aa,v 1.3 2000/07/12 20:08:12 jlam Exp $ ---- configure.orig Sun Sep 28 19:23:25 1997 -+++ configure Fri Dec 5 11:39:17 1997 +--- configure.orig Sun Sep 28 13:23:25 1997 ++++ configure Tue Jul 11 02:33:58 2000 @@ -1236,6 +1236,8 @@ # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' @@ -20,7 +20,23 @@ $NetBSD: patch-aa,v 1.2 1998/08/07 11:08:57 agc Exp $ EXP_LIB_FILE=$EXP_SHARED_LIB_FILE EXP_LIB_FILES="$EXP_SHARED_LIB_FILE $EXP_UNSHARED_LIB_FILE" echo "$ac_t""both shared and unshared" 1>&6 -@@ -6008,17 +6010,18 @@ +@@ -5862,6 +5864,15 @@ + EXP_AND_TCL_LIBS="$EXP_AND_TCL_LIBS $TCL_LD_SEARCH_FLAGS" + EXP_AND_TK_LIBS="$EXP_AND_TK_LIBS $TCL_LD_SEARCH_FLAGS" + ++# For NetBSD pkgsrc: ++# ++# Pass correct flags to linker so that expect finds libraries at run-time. ++# The Tcl and Tk libraries are in ${LOCALBASE}/lib. The X11 libraries are ++# in ${X11BASE}/lib. ++# ++EXP_AND_TCL_LIBS="-Wl,-R${LOCALBASE}/lib $EXP_AND_TCL_LIBS" ++EXP_AND_TK_LIBS="-Wl,-R${LOCALBASE}/lib -Wl,-R${X11BASE}/lib $EXP_AND_TK_LIBS" ++ + # Sigh - Tcl's defines SHLIB_LD_LIBS to be either empty or ${LIBS} and + # LIBS is intended to be expanded by Make. But since we're too close + # to hitting config's max symbols, pack everything together here and +@@ -6008,17 +6019,18 @@ s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g |