diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-10 15:03:05 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-03-10 15:03:05 (GMT) |
| commit | dc2b8a3abb2161430e1c433bc6dacbde63618ffd (patch) | |
| tree | 1df6f43b4d428daf8e9bdbeb0545343f9e5fc7d3 /unix | |
| parent | 682d578594801f766c1f2d7a92de69e0aef789ef (diff) | |
| parent | 004ba850eddb15bceb8c695fb61bc96b6fb4f098 (diff) | |
| download | tcl-dc2b8a3abb2161430e1c433bc6dacbde63618ffd.zip tcl-dc2b8a3abb2161430e1c433bc6dacbde63618ffd.tar.gz tcl-dc2b8a3abb2161430e1c433bc6dacbde63618ffd.tar.bz2 | |
Merge 9.0. Add ::tcl::clock to library/tclIndex
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 16 | ||||
| -rw-r--r-- | unix/configure.ac | 2 | ||||
| -rw-r--r-- | unix/tcl.m4 | 11 | ||||
| -rw-r--r-- | unix/tcl.spec | 2 |
4 files changed, 13 insertions, 18 deletions
diff --git a/unix/configure b/unix/configure index 946e512..c8e5bdc 100755 --- a/unix/configure +++ b/unix/configure @@ -2710,7 +2710,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu TCL_VERSION=9.0 TCL_MAJOR_VERSION=9 TCL_MINOR_VERSION=0 -TCL_PATCH_LEVEL="b1" +TCL_PATCH_LEVEL="b2" VERSION=${TCL_VERSION} EXTRA_INSTALL_BINARIES=${EXTRA_INSTALL_BINARIES:-"@:"} @@ -6402,16 +6402,12 @@ fi case $system in DragonFly-*|FreeBSD-*) - if test "${TCL_THREADS}" = "1" -then : - - # The -pthread needs to go in the LDFLAGS, not LIBS - LIBS=`echo $LIBS | sed s/-pthread//` - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - LDFLAGS="$LDFLAGS $PTHREAD_LIBS" -fi + # The -pthread needs to go in the LDFLAGS, not LIBS + LIBS=`echo $LIBS | sed s/-pthread//` + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LDFLAGS="$LDFLAGS $PTHREAD_LIBS" ;; - esac + esac if test $doRpath = yes then : diff --git a/unix/configure.ac b/unix/configure.ac index 03d7e5a..df38377 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -26,7 +26,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [ TCL_VERSION=9.0 TCL_MAJOR_VERSION=9 TCL_MINOR_VERSION=0 -TCL_PATCH_LEVEL="b1" +TCL_PATCH_LEVEL="b2" VERSION=${TCL_VERSION} EXTRA_INSTALL_BINARIES=${EXTRA_INSTALL_BINARIES:-"@:"} diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 4a9fe40..7b84923 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1276,13 +1276,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ case $system in DragonFly-*|FreeBSD-*) - AS_IF([test "${TCL_THREADS}" = "1"], [ - # The -pthread needs to go in the LDFLAGS, not LIBS - LIBS=`echo $LIBS | sed s/-pthread//` - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - LDFLAGS="$LDFLAGS $PTHREAD_LIBS"]) + # The -pthread needs to go in the LDFLAGS, not LIBS + LIBS=`echo $LIBS | sed s/-pthread//` + CFLAGS="$CFLAGS $PTHREAD_CFLAGS" + LDFLAGS="$LDFLAGS $PTHREAD_LIBS" ;; - esac + esac AS_IF([test $doRpath = yes], [ CC_SEARCH_FLAGS='"-Wl,-rpath,${LIB_RUNTIME_DIR}"']) diff --git a/unix/tcl.spec b/unix/tcl.spec index d56cee3..65194f6 100644 --- a/unix/tcl.spec +++ b/unix/tcl.spec @@ -4,7 +4,7 @@ Name: tcl Summary: Tcl scripting language development environment -Version: 9.0b1 +Version: 9.0b2 Release: 2 License: BSD Group: Development/Languages |