diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2014-03-20 11:06:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2014-03-20 11:06:17 (GMT) |
| commit | 57b78a13cff747763bfa73cc49667bb324a52c9c (patch) | |
| tree | aabc83a6d01ff7bde3963335f88b62ca49ff2c30 /unix | |
| parent | a203d9d44b4b58d6b1a959f3ac96d5f7e7dbf616 (diff) | |
| parent | 9c0a8eeb010141f3b23d0ed4041654431970e550 (diff) | |
| download | tk-57b78a13cff747763bfa73cc49667bb324a52c9c.zip tk-57b78a13cff747763bfa73cc49667bb324a52c9c.tar.gz tk-57b78a13cff747763bfa73cc49667bb324a52c9c.tar.bz2 | |
Fix [http://core.tcl.tk/tcl/info/2f7cbd01c3|2f7cbd01c3]: tcl8.6.1 fails to build on FreeBSD 10.0
FossilOrigin-Name: aac01f86ca75a2c256028cc59393f40bafe8e47d
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 14 | ||||
| -rw-r--r-- | unix/tcl.m4 | 14 |
2 files changed, 18 insertions, 10 deletions
diff --git a/unix/configure b/unix/configure index ad9b051..f6544c3 100755 --- a/unix/configure +++ b/unix/configure @@ -5606,11 +5606,15 @@ fi LDFLAGS="$LDFLAGS $PTHREAD_LIBS" fi - # Version numbers are dot-stripped by system policy. - TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' - TCL_LIB_VERSIONS_OK=nodots + case $system in + FreeBSD-3.*) + # Version numbers are dot-stripped by system policy. + TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' + TCL_LIB_VERSIONS_OK=nodots + ;; + esac ;; Darwin-*) CFLAGS_OPTIMIZE="-Os" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 25137d0..a0f448b 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1545,11 +1545,15 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ LIBS=`echo $LIBS | sed s/-pthread//` CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LDFLAGS="$LDFLAGS $PTHREAD_LIBS"]) - # Version numbers are dot-stripped by system policy. - TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` - UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1' - TCL_LIB_VERSIONS_OK=nodots + case $system in + FreeBSD-3.*) + # Version numbers are dot-stripped by system policy. + TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .` + UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so' + TCL_LIB_VERSIONS_OK=nodots + ;; + esac ;; Darwin-*) CFLAGS_OPTIMIZE="-Os" |