Skip to content

Commit adbe000

Browse files
author
jan.nijtmans
committed
Update TEA
2 parents 54b08c5 + e1ce065 commit adbe000

File tree

1 file changed

+43
-5
lines changed

1 file changed

+43
-5
lines changed

configure

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4001,8 +4001,11 @@ printf "%s\n" "$TEA_PLATFORM" >&6; }
40014001

40024002
# The BUILD_$pkg is to define the correct extern storage class
40034003
# handling when making this package
4004+
# To be able to sefely use the package name in a #define, it must not
4005+
# contain anything other than alphanumeric characters and underscores
4006+
SAFE_PKG_NAME=thread
40044007

4005-
printf "%s\n" "#define BUILD_${PACKAGE_NAME} /**/" >>confdefs.h
4008+
printf "%s\n" "#define BUILD_${SAFE_PKG_NAME} /**/" >>confdefs.h
40064009

40074010
# Do this here as we have fully defined TEA_PLATFORM now
40084011
if test "${TEA_PLATFORM}" = "windows" ; then
@@ -6784,6 +6787,7 @@ fi
67846787
MACHINE="IA64"
67856788
;;
67866789
esac
6790+
do64bit_ok=yes
67876791
fi
67886792

67896793
if test "$GCC" != "yes" ; then
@@ -6794,7 +6798,7 @@ fi
67946798
fi
67956799
case "x`echo \${VisualStudioVersion}`" in
67966800
x1[4-9]*)
6797-
lflags="${lflags} -nodefaultlib:libucrt.lib"
6801+
lflags="${lflags} -nodefaultlib:ucrt.lib"
67986802

67996803
vars="ucrt.lib"
68006804
for i in $vars; do
@@ -7201,7 +7205,7 @@ fi
72017205
SHLIB_LD='${CC} -shared'
72027206
SHLIB_SUFFIX=".dll"
72037207
if test "${TEA_PLATFORM}" = "unix" -a "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
7204-
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$(patsubst cyg%.dll,lib%.dll.a,\$@)"
7208+
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$(patsubst cyg%.dll,lib%.dll,\$@).a"
72057209
else
72067210
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
72077211
fi
@@ -9286,8 +9290,6 @@ rm -rf conftest*
92869290

92879291
printf "%s\n" "#define TCL_MAJOR_VERSION 8" >>confdefs.h
92889292

9289-
fi
9290-
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tk8}" != x; then
92919293

92929294
printf "%s\n" "#define TK_MAJOR_VERSION 8" >>confdefs.h
92939295

@@ -9303,6 +9305,42 @@ printf "%s\n" "#define TK_MAJOR_VERSION 8" >>confdefs.h
93039305
if test "$GCC" = "yes"; then
93049306
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -static-libgcc"
93059307
fi
9308+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker understands --disable-high-entropy-va" >&5
9309+
printf %s "checking if the linker understands --disable-high-entropy-va... " >&6; }
9310+
if test ${tcl_cv_ld_high_entropy+y}
9311+
then :
9312+
printf %s "(cached) " >&6
9313+
else case e in #(
9314+
e)
9315+
hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Wl,--disable-high-entropy-va"
9316+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
9317+
/* end confdefs.h. */
9318+
9319+
int
9320+
main (void)
9321+
{
9322+
9323+
;
9324+
return 0;
9325+
}
9326+
_ACEOF
9327+
if ac_fn_c_try_link "$LINENO"
9328+
then :
9329+
tcl_cv_ld_high_entropy=yes
9330+
else case e in #(
9331+
e) tcl_cv_ld_high_entropy=no ;;
9332+
esac
9333+
fi
9334+
rm -f core conftest.err conftest.$ac_objext conftest.beam \
9335+
conftest$ac_exeext conftest.$ac_ext
9336+
CFLAGS=$hold_cflags ;;
9337+
esac
9338+
fi
9339+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_high_entropy" >&5
9340+
printf "%s\n" "$tcl_cv_ld_high_entropy" >&6; }
9341+
if test $tcl_cv_ld_high_entropy = yes; then
9342+
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--disable-high-entropy-va"
9343+
fi
93069344
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
93079345
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
93089346
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"

0 commit comments

Comments
 (0)