Back out latest changes which added "-Wl,-R" flags to TCL_LIB_SPEC in

tclConfig.sh.  The correct thing to do requires some more thought and
perhaps some feedback from the Scriptics folks.

2 files changed, 17 insertions, 20 deletions

diff --git a/lang/tcl80/files/patch-sum b/lang/tcl80/files/patch-sum
index 20b2c592363..fd52437e50d 100644
--- a/lang/tcl80/files/patch-sum
+++ b/lang/tcl80/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.4 2000/07/10 16:55:01 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.5 2000/07/12 20:07:49 jlam Exp $
 
 MD5 (patch-aa) = 0389df0c4d4fc403f226e6688d054ba8
-MD5 (patch-ab) = f98da4de12f76935cbc5c910e6219321
+MD5 (patch-ab) = 611fe6bc115e39d0a74f0ee30010bc30
 MD5 (patch-ac) = a7dd6ec3775f5ef218ef81afb9295ffd
 MD5 (patch-ad) = 1fe091addf3bfc33db2bc258aa621796
diff --git a/lang/tcl80/patches/patch-ab b/lang/tcl80/patches/patch-ab
index 99c76531aee..c9088cf8151 100644
--- a/lang/tcl80/patches/patch-ab
+++ b/lang/tcl80/patches/patch-ab
@@ -1,7 +1,15 @@
-$NetBSD: patch-ab,v 1.8 2000/06/21 16:23:24 hubertf Exp $
+$NetBSD: patch-ab,v 1.9 2000/07/12 20:07:50 jlam Exp $
 
---- configure.orig	Tue Mar  9 07:51:26 1999
-+++ configure	Wed Jun 21 18:01:00 2000
+Use -fPIC on NetBSD
+On Solaris, fix up the tcl library name, so it's the same as NetBSD
+for pkgsrc internal use (PLIST entries)
+On Solaris, do not use dots in version names for the library (same
+reason as previous)
+Use -fPIC on Solaris too, otherwise we overflow a 2048 entry table.
+Set TCL_SHARED_BUILD to 1.
+
+--- configure.orig	Tue Mar  9 06:51:26 1999
++++ configure	Thu Apr  1 14:12:15 1999
 @@ -4096,7 +4096,7 @@
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -30,23 +38,12 @@ $NetBSD: patch-ab,v 1.8 2000/06/21 16:23:24 hubertf Exp $
  	;;
      ULTRIX-4.*)
  	SHLIB_CFLAGS="-G 0"
-@@ -4680,6 +4683,8 @@
+@@ -4679,6 +4682,8 @@
+     eval "TCL_LIB_FILE=libtcl${TCL_UNSHARED_LIB_SUFFIX}"
      MAKE_LIB="ar cr \${TCL_LIB_FILE} \${OBJS}"
  fi
- 
-+TCL_SHARED_BUILD=1
 +
++TCL_SHARED_BUILD=1
+ 
  # Note:  in the following variable, it's important to use the absolute
  # path name of the Tcl directory rather than "..":  this is because
- # AIX remembers this path and will attempt to use it at run-time to look
-@@ -4690,8 +4695,8 @@
- else
-     TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
- fi
--TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
--TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
-+TCL_BUILD_LIB_SPEC="-Wl,-R`pwd` -L`pwd` ${TCL_LIB_FLAG}"
-+TCL_LIB_SPEC="-Wl,-R${exec_prefix}/lib -L${exec_prefix}/lib ${TCL_LIB_FLAG}"
- 
- # tclConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
- # so that the backslashes quoting the DBX braces are dropped.