Skip to content

Commit ba18b12

Browse files
author
jan.nijtmans
committed
Merge 2.8
2 parents 66aa545 + f3760c0 commit ba18b12

File tree

2 files changed

+32
-18
lines changed

2 files changed

+32
-18
lines changed

‎configure‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2780,16 +2780,16 @@ printf "%s\n" "$as_me: WARNING: --with-tcl argument should refer to directory co
27802780
`ls -d /usr/pkg/lib 2>/dev/null` \
27812781
`ls -d /usr/lib 2>/dev/null` \
27822782
`ls -d /usr/lib64 2>/dev/null` \
2783+
`ls -d /usr/lib/tcl9.1 2>/dev/null` \
27832784
`ls -d /usr/lib/tcl9.0 2>/dev/null` \
2784-
`ls -d /usr/lib/tcl8.7 2>/dev/null` \
27852785
`ls -d /usr/lib/tcl8.6 2>/dev/null` \
27862786
`ls -d /usr/lib/tcl8.5 2>/dev/null` \
2787+
`ls -d /usr/local/lib/tcl9.1 2>/dev/null` \
27872788
`ls -d /usr/local/lib/tcl9.0 2>/dev/null` \
2788-
`ls -d /usr/local/lib/tcl8.7 2>/dev/null` \
27892789
`ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
27902790
`ls -d /usr/local/lib/tcl8.5 2>/dev/null` \
2791+
`ls -d /usr/local/lib/tcl/tcl9.1 2>/dev/null` \
27912792
`ls -d /usr/local/lib/tcl/tcl9.0 2>/dev/null` \
2792-
`ls -d /usr/local/lib/tcl/tcl8.7 2>/dev/null` \
27932793
`ls -d /usr/local/lib/tcl/tcl8.6 2>/dev/null` \
27942794
`ls -d /usr/local/lib/tcl/tcl8.5 2>/dev/null` \
27952795
; do
@@ -7206,11 +7206,15 @@ fi
72067206
CC_SEARCH_FLAGS=""
72077207
LD_SEARCH_FLAGS=""
72087208
;;
7209-
CYGWIN_*)
7209+
CYGWIN_*|MINGW32_*|MINGW64_*|MSYS_*)
72107210
SHLIB_CFLAGS=""
72117211
SHLIB_LD='${CC} -shared'
72127212
SHLIB_SUFFIX=".dll"
7213-
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
7213+
if test "${TEA_PLATFORM}" = "unix" -a "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
7214+
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$(patsubst cyg%.dll,lib%.dll.a,\$@)"
7215+
else
7216+
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
7217+
fi
72147218
EXEEXT=".exe"
72157219
do64bit_ok=yes
72167220
CC_SEARCH_FLAGS=""
@@ -9274,8 +9278,17 @@ rm -rf conftest*
92749278
# substituted. (@@@ Might not be necessary anymore)
92759279
#--------------------------------------------------------------------
92769280

9277-
PACKAGE_LIB_PREFIX8="${PACKAGE_LIB_PREFIX}"
9278-
PACKAGE_LIB_PREFIX9="${PACKAGE_LIB_PREFIX}tcl9"
9281+
if test "$TEA_PLATFORM" = "unix"; then
9282+
PACKAGE_LIB_PREFIX8="lib"
9283+
if test "$EXEEXT" = ".exe" -a "$SHARED_BUILD" != "0"; then
9284+
PACKAGE_LIB_PREFIX9="cygtcl9"
9285+
else
9286+
PACKAGE_LIB_PREFIX9="libtcl9"
9287+
fi
9288+
else
9289+
PACKAGE_LIB_PREFIX8=""
9290+
PACKAGE_LIB_PREFIX9="tcl9"
9291+
fi
92799292
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
92809293
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX9}"
92819294
else
@@ -9330,20 +9343,20 @@ printf "%s\n" "#define TK_MAJOR_VERSION 8" >>confdefs.h
93309343
if test x"${TK_BIN_DIR}" != x ; then
93319344
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
93329345
fi
9333-
eval eval "PKG_LIB_FILE8=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9334-
eval eval "PKG_LIB_FILE9=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9335-
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9346+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9347+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9348+
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
93369349
RANLIB=:
93379350
else
9338-
eval eval "PKG_LIB_FILE8=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9339-
eval eval "PKG_LIB_FILE9=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9340-
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9351+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9352+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9353+
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
93419354
fi
93429355
# Some packages build their own stubs libraries
93439356
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
9344-
eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub.a"
9357+
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub.a"
93459358
else
9346-
eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
9359+
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
93479360
fi
93489361
fi
93499362

‎win/rules.vc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ _RULES_VC = 1
2424
# For modifications that are not backward-compatible, you *must* change
2525
# the major version.
2626
RULES_VERSION_MAJOR = 1
27-
RULES_VERSION_MINOR = 13
27+
RULES_VERSION_MINOR = 14
2828

2929
# The PROJECT macro must be defined by parent makefile.
3030
!if "$(PROJECT)" == ""
@@ -697,7 +697,7 @@ LINKERFLAGS = $(LINKERFLAGS) -ltcg
697697
&& [nmakehlp -V "$(_TCL_H)" "define TCL_MAJOR_VERSION" >> versions.vc]
698698
!endif
699699
!if [echo TCL_MINOR_VERSION = \>> versions.vc] \
700-
&& [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]
700+
&& [nmakehlp -V "$(_TCL_H)" "define TCL_MINOR_VERSION" >> versions.vc]
701701
!endif
702702
!if [echo TCL_RELEASE_SERIAL = \>> versions.vc] \
703703
&& [nmakehlp -V "$(_TCL_H)" TCL_RELEASE_SERIAL >> versions.vc]
@@ -1297,7 +1297,8 @@ tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"
12971297

12981298
# Various output paths
12991299
PRJIMPLIB = $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
1300-
PRJLIBNAME8 = $(PROJECT)$(VERSION)$(SUFX).$(EXT)
1300+
# Even when building against Tcl 9, PRJLIBNAME8 must have "t"
1301+
PRJLIBNAME8 = $(PROJECT)$(VERSION)t$(SUFX:t=).$(EXT)
13011302
# Even when building against Tcl 8, PRJLIBNAME9 must not have "t"
13021303
PRJLIBNAME9 = tcl9$(PROJECT)$(VERSION)$(SUFX:t=).$(EXT)
13031304
!if $(TCL_MAJOR_VERSION) == 8 || "$(TCL_BUILD_FOR)" == "8"

0 commit comments

Comments
 (0)