summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-21 17:47:16 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-21 17:47:16 (GMT)
commit867adb4c9850d67520f5bc9120a055efe7328318 (patch)
tree4f68d68b86b5c783dcb63fa83ac15f8f528420bb
parentc474dae757819195f58b98303f5ceb73eba231f0 (diff)
downloadtk-867adb4c9850d67520f5bc9120a055efe7328318.zip
tk-867adb4c9850d67520f5bc9120a055efe7328318.tar.gz
tk-867adb4c9850d67520f5bc9120a055efe7328318.tar.bz2
Cherrypick Fix build on OpenBSD. [82701b94c4] missed a couple of bits.
Tcl/Tk's tcl.m4 isn't identical to TEA's tcl.m4 - be careful!
-rwxr-xr-xunix/configure4
-rw-r--r--unix/tcl.m46
2 files changed, 7 insertions, 3 deletions
diff --git a/unix/configure b/unix/configure
index 442004d..6300b1b 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5364,13 +5364,15 @@ fi
esac
SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
if test $doRpath = yes; then
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
fi
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
LDFLAGS="-Wl,-export-dynamic"
CFLAGS_OPTIMIZE="-O2"
if test "${TCL_THREADS}" = "1"; then
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index fc488e4..26b2a4a 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1476,10 +1476,12 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
esac
SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
SHLIB_SUFFIX=".so"
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS=""
AS_IF([test $doRpath = yes], [
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
LDFLAGS="-Wl,-export-dynamic"
CFLAGS_OPTIMIZE="-O2"
AS_IF([test "${TCL_THREADS}" = "1"], [
@@ -2683,7 +2685,7 @@ AC_DEFUN([SC_TCL_CFG_ENCODING], [
# advancedTest - the advanced test to run if the function is present
#
# Results:
-# Might cause compatability versions of the function to be used.
+# Might cause compatibility versions of the function to be used.
# Might affect the following vars:
# USE_COMPAT (implicit)
#