Subject: FreeBSD 4 & 5 serious trouble with lang/tcl and x11/tk
To: None <tech-pkg@netbsd.org>
From: Michal Pasternak <michal@pasternak.w.lub.pl>
List: tech-pkg
Date: 03/30/2004 22:02:42
--k+w/mQv8wyuph6w0
Content-Type: text/plain; charset=iso-8859-2
Content-Disposition: inline
lang/tcl/PLIST expects that the tcl library will have no dot between 8 and 4:
lib/libtcl84.${SHLIB_SUFX}
lib/libtcl84.so
lib/libtcl84.so.1
lib/libtcl84.so.1.0
lib/libtclstub84.a
Unfortunatley, unix/configure of tcl inserts a dot between 8 and 4, for all
FreeBSD systems different, than FreeBSD-3, which makes this PLIST (and
future buildlinks) fail bad:
FreeBSD-3*)
# FreeBSD-3 doesn't handle version numbers with dots.
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
TCL_LIB_VERSIONS_OK=nodots
;;
esac
;;
This is about the same issue for x11/tk .
Attached are 2 patches, that solve this problem.
I have build successfully tcl, tk, x11/py-Tk and wip/py-OpenGL (which
depends on py-Tk) with those, so I guess they correct the situation.
Sorry for not using send-pr or the webpage - wip one didn't work as I
expected, and I somehow belive, that webpage changes the formatting of the
text, rendering patches unuseable (heck, I even don't have webbrowser handy
right now).
Take care,
--
Michal Pasternak :: http://pasternak.w.lub.pl :: http://winsrc.sf.net
For your Occupation, choose 2 of the following three:
1) Fun, 2) Well-paying, 3) Legal.
--k+w/mQv8wyuph6w0
Content-Type: text/plain; charset=iso-8859-2
Content-Disposition: attachment; filename="lang_tcl.FREEBSD_NODOTZ.patch"
? lang_tcl.FREEBSD_NODOTZ.patch
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/lang/tcl/patches/patch-ab,v
retrieving revision 1.24
diff -u -r1.24 patch-ab
--- patches/patch-ab 25 Mar 2004 22:49:14 -0000 1.24
+++ patches/patch-ab 30 Mar 2004 19:17:22 -0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.24 2004/03/25 22:49:14 jlam Exp $
+$NetBSD$
---- configure.orig Mon Mar 1 18:58:59 2004
+--- configure.orig Mon Mar 1 23:58:59 2004
+++ configure
@@ -5613,6 +5613,7 @@ fi
# Step 3: set configuration options based on system name and version.
@@ -295,7 +295,7 @@
CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-@@ -6344,14 +6367,14 @@ fi
+@@ -6344,18 +6367,21 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -311,8 +311,16 @@
+ LD_FLAGS="$LD_FLAGS -pthread"
fi
case $system in
- FreeBSD-3.*)
-@@ -6372,7 +6395,7 @@ fi
+- FreeBSD-3.*)
++ FreeBSD-*)
+ # FreeBSD-3 doesn't handle version numbers with dots.
++ # Pkgsrc forces nodots for all FreeBSD systems, because
++ # such libraries can be handled by FreeBSD and are consistend
++ # with PLIST for other operating systems
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ TCL_LIB_VERSIONS_OK=nodots
+@@ -6372,7 +6398,7 @@ fi
DL_OBJS="tclLoadDyld.o"
PLAT_OBJS="tclMacOSXBundle.o"
DL_LIBS=""
@@ -321,7 +329,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
CFLAGS_OPTIMIZE="-Os"
-@@ -6389,7 +6412,7 @@ fi
+@@ -6389,7 +6415,7 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadNext.o"
DL_LIBS=""
@@ -330,7 +338,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -6409,7 +6432,7 @@ EOF
+@@ -6409,7 +6435,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadOSF.o"
DL_LIBS=""
@@ -339,7 +347,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -6425,7 +6448,7 @@ EOF
+@@ -6425,7 +6451,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -348,7 +356,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -6441,7 +6464,7 @@ EOF
+@@ -6441,7 +6467,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -357,7 +365,7 @@
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
if test "$GCC" = "yes" ; then
-@@ -6458,7 +6481,7 @@ EOF
+@@ -6458,7 +6484,7 @@ EOF
LIBS="$LIBS -lpthread -lmach -lexc"
else
EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread"
@@ -366,7 +374,7 @@
fi
fi
-@@ -6473,7 +6496,7 @@ EOF
+@@ -6473,7 +6499,7 @@ EOF
DL_OBJS="tclLoadDl.o"
# dlopen is in -lc on QNX
DL_LIBS=""
@@ -375,7 +383,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -6484,7 +6507,7 @@ EOF
+@@ -6484,7 +6510,7 @@ EOF
SHLIB_SUFFIX=".a"
DL_OBJS="tclLoadAout.o"
DL_LIBS=""
@@ -384,7 +392,7 @@
CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
;;
-@@ -6494,10 +6517,10 @@ EOF
+@@ -6494,10 +6520,10 @@ EOF
# below.
if test "$GCC" = "yes" ; then
SHLIB_CFLAGS="-fPIC -melf"
@@ -397,7 +405,7 @@
fi
SHLIB_LD="ld -G"
SHLIB_LD_LIBS=""
-@@ -6514,7 +6537,7 @@ EOF
+@@ -6514,7 +6540,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
@@ -406,7 +414,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -6525,7 +6548,7 @@ EOF
+@@ -6525,7 +6551,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
@@ -415,7 +423,7 @@
CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-@@ -6561,7 +6584,7 @@ EOF
+@@ -6561,7 +6587,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
@@ -424,7 +432,7 @@
if test "$GCC" = "yes" ; then
SHLIB_LD="$CC -shared"
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
-@@ -6587,7 +6610,7 @@ EOF
+@@ -6587,7 +6613,7 @@ EOF
SHLIB_CFLAGS="-KPIC"
@@ -433,7 +441,7 @@
# Check to enable 64-bit flags for compiler/linker
if test "$do64bit" = "yes" ; then
-@@ -6599,10 +6622,10 @@ EOF
+@@ -6599,10 +6625,10 @@ EOF
do64bit_ok=yes
if test "$do64bitVIS" = "yes" ; then
EXTRA_CFLAGS="-xarch=v9a"
@@ -446,7 +454,7 @@
fi
fi
else
-@@ -6626,6 +6649,9 @@ EOF
+@@ -6626,6 +6652,9 @@ EOF
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
@@ -456,7 +464,7 @@
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -6634,7 +6660,7 @@ EOF
+@@ -6634,7 +6663,7 @@ EOF
SHLIB_LD_LIBS='${LIBS}'
DL_OBJS="tclLoadAout.o"
DL_LIBS=""
@@ -465,7 +473,7 @@
CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
if test "$GCC" != "yes" ; then
-@@ -6675,9 +6701,9 @@ rm -f conftest*
+@@ -6675,9 +6704,9 @@ rm -f conftest*
LDFLAGS=$hold_ldflags
echo "$ac_t""$found" 1>&6
if test $found = yes; then
@@ -477,7 +485,7 @@
fi
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
-@@ -6852,7 +6878,7 @@ fi
+@@ -6852,7 +6881,7 @@ fi
SHLIB_SUFFIX=""
DL_OBJS="tclLoadNone.o"
DL_LIBS=""
@@ -486,7 +494,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
BUILD_DLTEST=""
-@@ -6897,8 +6923,8 @@ fi
+@@ -6897,8 +6926,8 @@ fi
if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -497,7 +505,7 @@
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -6915,10 +6941,10 @@ fi
+@@ -6915,10 +6944,10 @@ fi
# Stub lib does not depend on shared/static configuration
if test "$RANLIB" = "" ; then
@@ -510,7 +518,7 @@
INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))'
fi
-@@ -7217,7 +7243,7 @@ elif test "$SHARED_BUILD" = "0" || test
+@@ -7217,7 +7246,7 @@ elif test "$SHARED_BUILD" = "0" || test
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
fi
TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -519,7 +527,7 @@
else
TCL_BUILD_EXP_FILE="lib.exp"
eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -7247,13 +7273,19 @@ VERSION=${TCL_VERSION}
+@@ -7247,13 +7276,19 @@ VERSION=${TCL_VERSION}
#--------------------------------------------------------------------
if test "$FRAMEWORK_BUILD" = "1" ; then
@@ -543,7 +551,7 @@
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
# stub support.
-@@ -7487,6 +7519,7 @@ s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
+@@ -7487,6 +7522,7 @@ s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
s%@CC_SEARCH_FLAGS@%$CC_SEARCH_FLAGS%g
s%@LD_SEARCH_FLAGS@%$LD_SEARCH_FLAGS%g
--k+w/mQv8wyuph6w0
Content-Type: text/plain; charset=iso-8859-2
Content-Disposition: attachment; filename="x11_tk.FREEBSD_NODOTZ.diff"
? x11_tk.FREEBSD_NODOTZ.diff
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/x11/tk/patches/patch-ab,v
retrieving revision 1.15
diff -u -r1.15 patch-ab
--- patches/patch-ab 25 Mar 2004 22:49:15 -0000 1.15
+++ patches/patch-ab 30 Mar 2004 19:50:00 -0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.15 2004/03/25 22:49:15 jlam Exp $
+$NetBSD$
---- configure.orig Mon Mar 1 19:04:48 2004
+--- configure.orig Tue Mar 2 00:04:48 2004
+++ configure
@@ -2071,6 +2071,7 @@ fi
# Step 3: set configuration options based on system name and version.
@@ -283,7 +283,7 @@
CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-@@ -2802,14 +2824,14 @@ fi
+@@ -2802,23 +2824,21 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -298,9 +298,24 @@
- LDFLAGS="$LDFLAGS -pthread"
+ LD_FLAGS="$LD_FLAGS -pthread"
fi
- case $system in
- FreeBSD-3.*)
-@@ -2830,7 +2852,7 @@ fi
+- case $system in
+- FreeBSD-3.*)
+- # FreeBSD-3 doesn't handle version numbers with dots.
+- UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+- TCL_LIB_VERSIONS_OK=nodots
+- ;;
+- esac
++ # Pkgsrc forces nodots for all FreeBSD systems, because
++ # they can handle such version numbers, and this is consistent
++ # with PLISTs for other OSs
++ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
++ TCL_LIB_VERSIONS_OK=nodots
+ ;;
+ Rhapsody-*|Darwin-*)
+ SHLIB_CFLAGS="-fno-common"
+@@ -2830,7 +2850,7 @@ fi
DL_OBJS="tclLoadDyld.o"
PLAT_OBJS="tclMacOSXBundle.o"
DL_LIBS=""
@@ -309,7 +324,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
CFLAGS_OPTIMIZE="-Os"
-@@ -2847,7 +2869,7 @@ fi
+@@ -2847,7 +2867,7 @@ fi
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadNext.o"
DL_LIBS=""
@@ -318,7 +333,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -2867,7 +2889,7 @@ EOF
+@@ -2867,7 +2887,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadOSF.o"
DL_LIBS=""
@@ -327,7 +342,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -2883,7 +2905,7 @@ EOF
+@@ -2883,7 +2903,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -336,7 +351,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -2899,7 +2921,7 @@ EOF
+@@ -2899,7 +2919,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -345,7 +360,7 @@
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
if test "$GCC" = "yes" ; then
-@@ -2916,7 +2938,7 @@ EOF
+@@ -2916,7 +2936,7 @@ EOF
LIBS="$LIBS -lpthread -lmach -lexc"
else
EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread"
@@ -354,7 +369,7 @@
fi
fi
-@@ -2931,7 +2953,7 @@ EOF
+@@ -2931,7 +2951,7 @@ EOF
DL_OBJS="tclLoadDl.o"
# dlopen is in -lc on QNX
DL_LIBS=""
@@ -363,7 +378,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -2942,7 +2964,7 @@ EOF
+@@ -2942,7 +2962,7 @@ EOF
SHLIB_SUFFIX=".a"
DL_OBJS="tclLoadAout.o"
DL_LIBS=""
@@ -372,7 +387,7 @@
CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
;;
-@@ -2952,10 +2974,10 @@ EOF
+@@ -2952,10 +2972,10 @@ EOF
# below.
if test "$GCC" = "yes" ; then
SHLIB_CFLAGS="-fPIC -melf"
@@ -385,7 +400,7 @@
fi
SHLIB_LD="ld -G"
SHLIB_LD_LIBS=""
-@@ -2972,7 +2994,7 @@ EOF
+@@ -2972,7 +2992,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
@@ -394,7 +409,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
;;
-@@ -2983,7 +3005,7 @@ EOF
+@@ -2983,7 +3003,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
@@ -403,7 +418,7 @@
CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-@@ -3019,7 +3041,7 @@ EOF
+@@ -3019,7 +3039,7 @@ EOF
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS="-ldl"
@@ -412,7 +427,7 @@
if test "$GCC" = "yes" ; then
SHLIB_LD="$CC -shared"
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
-@@ -3045,7 +3067,7 @@ EOF
+@@ -3045,7 +3065,7 @@ EOF
SHLIB_CFLAGS="-KPIC"
@@ -421,7 +436,7 @@
# Check to enable 64-bit flags for compiler/linker
if test "$do64bit" = "yes" ; then
-@@ -3057,10 +3079,10 @@ EOF
+@@ -3057,10 +3077,10 @@ EOF
do64bit_ok=yes
if test "$do64bitVIS" = "yes" ; then
EXTRA_CFLAGS="-xarch=v9a"
@@ -434,7 +449,7 @@
fi
fi
else
-@@ -3084,6 +3106,9 @@ EOF
+@@ -3084,6 +3104,9 @@ EOF
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
@@ -444,7 +459,7 @@
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -3092,7 +3117,7 @@ EOF
+@@ -3092,7 +3115,7 @@ EOF
SHLIB_LD_LIBS='${LIBS}'
DL_OBJS="tclLoadAout.o"
DL_LIBS=""
@@ -453,7 +468,7 @@
CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
if test "$GCC" != "yes" ; then
-@@ -3133,9 +3158,9 @@ rm -f conftest*
+@@ -3133,9 +3156,9 @@ rm -f conftest*
LDFLAGS=$hold_ldflags
echo "$ac_t""$found" 1>&6
if test $found = yes; then
@@ -465,7 +480,7 @@
fi
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
-@@ -3310,7 +3335,7 @@ fi
+@@ -3310,7 +3333,7 @@ fi
SHLIB_SUFFIX=""
DL_OBJS="tclLoadNone.o"
DL_LIBS=""
@@ -474,7 +489,7 @@
CC_SEARCH_FLAGS=""
LD_SEARCH_FLAGS=""
BUILD_DLTEST=""
-@@ -3355,8 +3380,8 @@ fi
+@@ -3355,8 +3378,8 @@ fi
if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -485,7 +500,7 @@
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -4428,7 +4453,11 @@ echo "configure:4426: checking for X11 l
+@@ -4428,7 +4451,11 @@ echo "configure:4426: checking for X11 l
for i in $dirs ; do
if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
echo "$ac_t""$i" 1>&6
@@ -498,7 +513,7 @@
x_libraries="$i"
break
fi
-@@ -4437,7 +4466,11 @@ echo "configure:4426: checking for X11 l
+@@ -4437,7 +4464,11 @@ echo "configure:4426: checking for X11 l
if test "$x_libraries" = ""; then
XLIBSW=-lX11
else
@@ -511,7 +526,7 @@
fi
fi
if test "$XLIBSW" = nope ; then
-@@ -4507,6 +4540,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -4507,6 +4538,10 @@ if test "x${x_libraries}" != "x"; then
fi
if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
@@ -522,7 +537,7 @@
fi
# The statement below is very tricky! It actually *evaluates* the
-@@ -5156,11 +5193,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
+@@ -5156,11 +5191,18 @@ eval "TK_LIB_FILE=${TK_LIB_FILE}"
if test "$SHARED_BUILD" = 0 -o $TCL_NEEDS_EXP_FILE = 0; then
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
@@ -542,7 +557,7 @@
TK_BUILD_EXP_FILE=""
TK_EXP_FILE=""
else
-@@ -5405,6 +5449,7 @@ s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
+@@ -5405,6 +5447,7 @@ s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
s%@CC_SEARCH_FLAGS@%$CC_SEARCH_FLAGS%g
s%@LD_SEARCH_FLAGS@%$LD_SEARCH_FLAGS%g
--k+w/mQv8wyuph6w0--