pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/tcl Apply a fix for library naming on IRIX 5 and ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/bdba03855dc6
branches: trunk
changeset: 466640:bdba03855dc6
user: jwise <jwise%pkgsrc.org@localhost>
date: Wed Jan 21 19:30:33 2004 +0000
description:
Apply a fix for library naming on IRIX 5 and 6, based on a patch
submitted in private mail by Georg Schwarz. Prevents PLIST mismatches
on these platforms.
Tested for non-interference with other platforms, but no specific
IRIX testing of this version of fix yet performed.
diffstat:
lang/tcl/distinfo | 6 ++--
lang/tcl/patches/patch-ab | 60 +++++++++++++++++++++++++++++++++++-----------
lang/tcl/patches/patch-af | 42 ++++++++++++++++++++++++++++----
3 files changed, 84 insertions(+), 24 deletions(-)
diffs (232 lines):
diff -r cb4c610a9bc6 -r bdba03855dc6 lang/tcl/distinfo
--- a/lang/tcl/distinfo Wed Jan 21 19:10:09 2004 +0000
+++ b/lang/tcl/distinfo Wed Jan 21 19:30:33 2004 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.15 2004/01/05 11:22:13 jlam Exp $
+$NetBSD: distinfo,v 1.16 2004/01/21 19:30:33 jwise Exp $
SHA1 (tcl8.3.4.tar.gz) = b179f1f51b322b7045cf152b73df4f3d01da82ec
Size (tcl8.3.4.tar.gz) = 2654756 bytes
SHA1 (patch-aa) = 3e9fa9427f40a4c6b1f97bcda58fefe9d5cf20ce
-SHA1 (patch-ab) = 0350ffd17fe5e88d3e179b960d374248b41f9ad5
+SHA1 (patch-ab) = 5d89be3be6ac4cec9d9dc3a553c14aeaeeba9889
SHA1 (patch-ac) = d1e1b6ed334ff424140a678ed098504cc14614e8
SHA1 (patch-ae) = 5eee14adec88cf0cac5715fe0cfe7420b9b83774
-SHA1 (patch-af) = e19764a58f5ddd6b5b62e785ae305069c535f865
+SHA1 (patch-af) = 7b89db16f63cd3574b24234614c86f5f7ee9d2a3
diff -r cb4c610a9bc6 -r bdba03855dc6 lang/tcl/patches/patch-ab
--- a/lang/tcl/patches/patch-ab Wed Jan 21 19:10:09 2004 +0000
+++ b/lang/tcl/patches/patch-ab Wed Jan 21 19:30:33 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.19 2004/01/05 11:22:13 jlam Exp $
+$NetBSD: patch-ab,v 1.20 2004/01/21 19:30:33 jwise Exp $
---- configure.orig Fri Oct 19 17:24:15 2001
-+++ configure
-@@ -4776,6 +4776,7 @@ fi
+--- configure.orig 2001-10-19 20:24:15.000000000 -0400
++++ configure 2004-01-21 14:20:41.000000000 -0500
+@@ -4776,6 +4776,7 @@
# Step 3: set configuration options based on system name and version.
do64bit_ok=no
@@ -10,7 +10,37 @@
EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
-@@ -5298,6 +5299,9 @@ fi
+@@ -5114,6 +5115,9 @@
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ EXTRA_CFLAGS=""
+ LDFLAGS=""
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ IRIX-6.*|IRIX64-6.5*)
+ SHLIB_CFLAGS=""
+@@ -5138,6 +5142,9 @@
+ esac
+ LDFLAGS="-n32"
+ fi
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ IRIX64-6.*)
+ SHLIB_CFLAGS=""
+@@ -5148,6 +5155,9 @@
+ DL_LIBS=""
+ LDFLAGS=""
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ Linux*)
+ SHLIB_CFLAGS="-fPIC"
+@@ -5298,6 +5308,9 @@
LD_SEARCH_FLAGS=""
;;
NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
@@ -20,7 +50,7 @@
# Not available on all versions: check for include file.
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -5330,17 +5334,15 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -5330,17 +5343,15 @@
# NetBSD/SPARC needs -fPIC, -fpic will not do.
SHLIB_CFLAGS="-fPIC"
@@ -40,7 +70,7 @@
#include "confdefs.h"
#ifdef __ELF__
-@@ -5351,11 +5353,20 @@ EOF
+@@ -5351,11 +5362,20 @@
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
@@ -63,7 +93,7 @@
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
fi
-@@ -5569,6 +5580,9 @@ EOF
+@@ -5569,6 +5589,9 @@
DL_LIBS="-ldl"
LDFLAGS=""
LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -73,7 +103,7 @@
;;
SunOS-5*)
-@@ -5616,6 +5630,9 @@ EOF
+@@ -5616,6 +5639,9 @@
else
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
@@ -83,7 +113,7 @@
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -6103,7 +6120,7 @@ if test "${SHARED_BUILD}" = "1" -a "${SH
+@@ -6103,7 +6129,7 @@
if test "x$DL_OBJS" = "xtclLoadAout.o"; then
MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}"
else
@@ -92,7 +122,7 @@
fi
else
case $system in
-@@ -6141,7 +6158,7 @@ if test "$SHARED_BUILD" = "0" -o $TCL_NE
+@@ -6141,7 +6167,7 @@
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
fi
TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -101,7 +131,7 @@
else
TCL_BUILD_EXP_FILE="lib.exp"
eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -6171,10 +6188,17 @@ VERSION=${TCL_VERSION}
+@@ -6171,10 +6197,17 @@
#--------------------------------------------------------------------
if test "$prefix" != "$exec_prefix"; then
@@ -121,7 +151,7 @@
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
-@@ -6186,7 +6210,7 @@ eval "TCL_STUB_LIB_FILE=libtclstub${TCL_
+@@ -6186,7 +6219,7 @@
# Replace DBGX with TCL_DBGX
eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
@@ -130,7 +160,7 @@
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
-@@ -6262,6 +6286,8 @@ TCL_SHARED_BUILD=${SHARED_BUILD}
+@@ -6262,6 +6295,8 @@
@@ -139,7 +169,7 @@
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
-@@ -6437,12 +6463,12 @@ s%@TCL_DBGX@%$TCL_DBGX%g
+@@ -6437,12 +6472,12 @@
s%@CFG_TCL_SHARED_LIB_SUFFIX@%$CFG_TCL_SHARED_LIB_SUFFIX%g
s%@CFG_TCL_UNSHARED_LIB_SUFFIX@%$CFG_TCL_UNSHARED_LIB_SUFFIX%g
s%@CFG_TCL_EXPORT_FILE_SUFFIX@%$CFG_TCL_EXPORT_FILE_SUFFIX%g
diff -r cb4c610a9bc6 -r bdba03855dc6 lang/tcl/patches/patch-af
--- a/lang/tcl/patches/patch-af Wed Jan 21 19:10:09 2004 +0000
+++ b/lang/tcl/patches/patch-af Wed Jan 21 19:30:33 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.6 2001/12/23 17:02:32 bjoern Exp $
+$NetBSD: patch-af,v 1.7 2004/01/21 19:30:33 jwise Exp $
---- tcl.m4.orig Sat Oct 20 02:24:15 2001
-+++ tcl.m4
+--- tcl.m4.orig 2001-10-19 20:24:15.000000000 -0400
++++ tcl.m4 2004-01-21 13:57:23.000000000 -0500
@@ -601,6 +601,7 @@
# Step 3: set configuration options based on system name and version.
@@ -10,7 +10,37 @@
EXTRA_CFLAGS=""
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
-@@ -910,28 +911,36 @@
+@@ -790,6 +791,9 @@
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+ EXTRA_CFLAGS=""
+ LDFLAGS=""
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ IRIX-6.*|IRIX64-6.5*)
+ SHLIB_CFLAGS=""
+@@ -814,6 +818,9 @@
+ esac
+ LDFLAGS="-n32"
+ fi
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ IRIX64-6.*)
+ SHLIB_CFLAGS=""
+@@ -824,6 +831,9 @@
+ DL_LIBS=""
+ LDFLAGS=""
+ LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ Linux*)
+ SHLIB_CFLAGS="-fPIC"
+@@ -910,28 +920,36 @@
LD_SEARCH_FLAGS=""
;;
NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*)
@@ -52,7 +82,7 @@
], [
SHLIB_CFLAGS=""
SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1129,6 +1138,9 @@
+@@ -1129,6 +1147,9 @@
DL_LIBS="-ldl"
LDFLAGS=""
LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
@@ -62,7 +92,7 @@
;;
SunOS-5*)
-@@ -1173,6 +1185,9 @@
+@@ -1173,6 +1194,9 @@
else
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
Home |
Main Index |
Thread Index |
Old Index