diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-03-20 10:10:04 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2014-03-20 10:10:04 (GMT) |
| commit | 148177b382eb972506f96cd8bfb45c6958cea1b6 (patch) | |
| tree | 5c17f515e92f6cb9e45613740ca8017d62cc8f07 | |
| parent | 669f6c5b319d939a4c7207af3e3523f72b31ede8 (diff) | |
| parent | 088a4cf13f80f2f550ea83ae3e1cb085449aa424 (diff) | |
| download | tcl-148177b382eb972506f96cd8bfb45c6958cea1b6.zip tcl-148177b382eb972506f96cd8bfb45c6958cea1b6.tar.gz tcl-148177b382eb972506f96cd8bfb45c6958cea1b6.tar.bz2 | |
Fix [2f7cbd01c3]: tcl8.6.1 fails to build on FreeBSD 10.0
| -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 d3951b6..cfa8451 100755 --- a/unix/configure +++ b/unix/configure @@ -7761,11 +7761,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 cb6704b..d81af1a 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" |