From c685957d1e209454565350f63cd2687db170cfc5 Mon Sep 17 00:00:00 2001 From: dgp Date: Tue, 11 Sep 2012 13:59:52 +0000 Subject: contributed patch for Solaris 9/x86 support --- unix/tcl.m4 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 3974753..de1c98c 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1961,6 +1961,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ], [ do64bit_ok=yes case $system in +# Non functional check, m64/xarch depends on compiler not os version SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*) CFLAGS="$CFLAGS -m64" LDFLAGS="$LDFLAGS -m64";; @@ -1979,7 +1980,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ AS_IF([test "$GCC" = yes],[use_sunmath=no],[ arch=`isainfo` AC_MSG_CHECKING([whether to use -lsunmath for fp rounding control]) - AS_IF([test "$arch" = "amd64 i386"], [ + AS_IF([test "$arch" = "amd64 i386" -o "$arch" = "i386"], [ AC_MSG_RESULT([yes]) MATH_LIBS="-lsunmath $MATH_LIBS" AC_CHECK_HEADER(sunmath.h) @@ -2012,13 +2013,13 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ], [ AS_IF([test "$use_sunmath" = yes], [textmode=textoff],[textmode=text]) case $system in - SunOS-5.[[1-9]][[0-9]]*) + SunOS-5.[[1-9]][[0-9]]*|SunOS-5.[[7-9]]) SHLIB_LD="\${CC} -G -z $textmode \${LDFLAGS}";; *) SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";; esac CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR} -R${LIB_RUNTIME_DIR}' ]) ;; UNIX_SV* | UnixWare-5*) @@ -2103,7 +2104,7 @@ dnl # preprocessing tests use only CPPFLAGS. AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [ LIB_SUFFIX=${SHARED_LIB_SUFFIX} - MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' + MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LD_SEARCH_FLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}' AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)" -- cgit v0.12 From b81743690123f54e56cf9eaedffbf9dde1b9129b Mon Sep 17 00:00:00 2001 From: dkf Date: Wed, 12 Sep 2012 23:28:30 +0000 Subject: post-review, believed minimal --- unix/tcl.m4 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/unix/tcl.m4 b/unix/tcl.m4 index de1c98c..9ca88f1 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1961,7 +1961,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ], [ do64bit_ok=yes case $system in -# Non functional check, m64/xarch depends on compiler not os version SunOS-5.1[[1-9]]*|SunOS-5.[[2-9]][[0-9]]*) CFLAGS="$CFLAGS -m64" LDFLAGS="$LDFLAGS -m64";; @@ -2019,7 +2018,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";; esac CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}' - LD_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR} -R${LIB_RUNTIME_DIR}' + LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}' ]) ;; UNIX_SV* | UnixWare-5*) @@ -2104,7 +2103,7 @@ dnl # preprocessing tests use only CPPFLAGS. AS_IF([test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""], [ LIB_SUFFIX=${SHARED_LIB_SUFFIX} - MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LD_SEARCH_FLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS}' + MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)" -- cgit v0.12 From f5335509ab5c23c2e6d7d6fc66ecfef3f9a59011 Mon Sep 17 00:00:00 2001 From: dkf Date: Thu, 13 Sep 2012 08:14:03 +0000 Subject: [Bug 3567283]: Added missing cast. --- ChangeLog | 4 ++++ win/tkWinWm.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6f25d61..cdc5ca4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-09-13 Donal K. Fellows + + * win/tkWinWm.c (WmTransientCmd): [Bug 3567283]: Added missing cast. + 2012-09-11 Donal K. Fellows * generic/ttk/ttkEntry.c (EntryDisplay): [Bug 3566594]: Must manually diff --git a/win/tkWinWm.c b/win/tkWinWm.c index efed842..e353813 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -5526,7 +5526,7 @@ WmTransientCmd( } if (objc == 3) { if (masterPtr != NULL) { - Tcl_SetObjResult(interp, TkNewWindowObj(masterPtr)); + Tcl_SetObjResult(interp, TkNewWindowObj((Tk_Window) masterPtr)); } return TCL_OK; } -- cgit v0.12