rpms/insight/F-10 import.log, NONE, 1.1 insight-6.8-derefbug.patch, NONE, 1.1 insight-6.8-destdir.patch, NONE, 1.1 insight-6.8-gcc43.patch, NONE, 1.1 insight-6.8-ia64bound.patch, NONE, 1.1 insight-6.8-itcl33.patch, NONE, 1.1 insight-6.8-lib64.patch, NONE, 1.1 insight-6.8-readline-system.patch, NONE, 1.1 insight-6.8-relocate.patch, NONE, 1.1 insight-6.8-syspackages.patch, NONE, 1.1 insight-6.8-tclm4.patch, NONE, 1.1 insight-6.8-warnings.patch, NONE, 1.1 insight.1, NONE, 1.1 insight.desktop, NONE, 1.1 insight.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Patrick Monnerat
monnerat at fedoraproject.org
Wed Oct 15 09:46:22 UTC 2008
Author: monnerat
Update of /cvs/pkgs/rpms/insight/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12476/F-10
Modified Files:
.cvsignore sources
Added Files:
import.log insight-6.8-derefbug.patch
insight-6.8-destdir.patch insight-6.8-gcc43.patch
insight-6.8-ia64bound.patch insight-6.8-itcl33.patch
insight-6.8-lib64.patch insight-6.8-readline-system.patch
insight-6.8-relocate.patch insight-6.8-syspackages.patch
insight-6.8-tclm4.patch insight-6.8-warnings.patch insight.1
insight.desktop insight.spec
Log Message:
* Wed Oct 15 2008 Patrick Monnerat <pm at datasphere.ch> 6.8-4
- Initial CVS import.
--- NEW FILE import.log ---
insight-6_8-4_fc8:F-10:insight-6.8-4.fc8.src.rpm:1224063866
insight-6.8-derefbug.patch:
--- NEW FILE insight-6.8-derefbug.patch ---
diff -Naur insight-6.8.orig/gdb/gdbtk/generic/gdbtk-stack.c insight-6.8.new/gdb/gdbtk/generic/gdbtk-stack.c
--- insight-6.8.orig/gdb/gdbtk/generic/gdbtk-stack.c 2008-03-07 09:03:19.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/generic/gdbtk-stack.c 2008-08-15 17:52:50.000000000 +0200
@@ -251,7 +251,9 @@
gdb_get_args_command (ClientData clientData, Tcl_Interp *interp,
int objc, Tcl_Obj *CONST objv[])
{
- return gdb_get_vars_command ((ClientData) 1, interp, objc, objv);
+ static const int one = 1;
+
+ return gdb_get_vars_command ((ClientData) &one, interp, objc, objv);
}
@@ -259,7 +261,9 @@
gdb_get_locals_command (ClientData clientData, Tcl_Interp *interp,
int objc, Tcl_Obj *CONST objv[])
{
- return gdb_get_vars_command ((ClientData) 0, interp, objc, objv);
+ static const int zero = 0;
+
+ return gdb_get_vars_command ((ClientData) &zero, interp, objc, objv);
}
/* This implements the tcl commands "gdb_get_locals" and "gdb_get_args"
insight-6.8-destdir.patch:
--- NEW FILE insight-6.8-destdir.patch ---
diff -Naur insight-6.8.orig/itcl/itcl/Makefile.in insight-6.8.new/itcl/itcl/Makefile.in
--- insight-6.8.orig/itcl/itcl/Makefile.in 2005-09-01 07:32:08.000000000 +0200
+++ insight-6.8.new/itcl/itcl/Makefile.in 2008-08-15 14:50:06.000000000 +0200
@@ -149,8 +149,6 @@
includedir = @includedir@
oldincludedir = /usr/include
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@@VERSION@
pkglibdir = $(libdir)/@PACKAGE@@VERSION@
pkgincludedir = $(includedir)/@PACKAGE@@VERSION@
@@ -276,12 +274,12 @@
@echo "Installing header files in $(includedir)"
@for i in $(GENERIC_HDRS) ; do \
echo "Installing $$i" ; \
- $(INSTALL_DATA) $$i $(includedir) ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
done;
@echo "Installing library files in $(ITCL_LIBRARY)"
@for i in $(srcdir)/library/*.tcl ; do \
echo "Installing $$i" ; \
- $(INSTALL_DATA) $$i $(ITCL_LIBRARY) ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(ITCL_LIBRARY) ; \
done;
#========================================================================
@@ -290,14 +288,14 @@
#========================================================================
install-doc: doc
- $(mkinstalldirs) $(mandir)/mann
+ $(mkinstalldirs) $(DESTDIR)$(mandir)/mann
@echo "Installing man pages in $(mandir)"
@cd $(srcdir)/doc; for i in *.n; \
do \
echo "Installing $$i"; \
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
- $$i > $(mandir)/mann/$$i; \
- chmod 444 $(mandir)/mann/$$i; \
+ $$i > $(DESTDIR)$(mandir)/mann/$$i; \
+ chmod 444 $(DESTDIR)$(mandir)/mann/$$i; \
done
test: $(TCLSH_PROG)
@@ -447,7 +445,7 @@
$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
else :; fi; \
done
- $(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
#========================================================================
# Install binary executables (e.g. .exe files)
@@ -485,7 +483,7 @@
$(mkinstalldirs) $(DESTDIR)$(libdir)
$(mkinstalldirs) $(DESTDIR)$(bindir)
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
- $(mkinstalldirs) $(ITCL_LIBRARY)
+ $(mkinstalldirs) $(DESTDIR)$(ITCL_LIBRARY)
.PHONY: all binaries clean depend distclean doc install installdirs \
libraries test
diff -Naur insight-6.8.orig/itcl/itk/Makefile.in insight-6.8.new/itcl/itk/Makefile.in
--- insight-6.8.orig/itcl/itk/Makefile.in 2005-09-01 07:32:09.000000000 +0200
+++ insight-6.8.new/itcl/itk/Makefile.in 2008-08-15 14:55:41.000000000 +0200
@@ -137,8 +137,6 @@
includedir = @includedir@
oldincludedir = /usr/include
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@@VERSION@
pkglibdir = $(libdir)/@PACKAGE@@VERSION@
pkgincludedir = $(includedir)/@PACKAGE@@VERSION@
@@ -267,16 +265,16 @@
#========================================================================
install-libraries: libraries
- $(mkinstalldirs) $(includedir)
+ $(mkinstalldirs) $(DESTDIR)$(includedir)
@echo "Installing header files in $(includedir)"
@for i in $(GENERIC_HDRS) ; do \
echo "Installing $$i" ; \
- $(INSTALL_DATA) $$i $(includedir) ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(includedir) ; \
done;
@echo "Installing library files in $(ITK_LIBRARY)"
@for i in $(srcdir)/library/*.* $(srcdir)/library/tclIndex ; do \
echo "Installing $$i" ; \
- $(INSTALL_DATA) $$i $(ITK_LIBRARY) ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(ITK_LIBRARY) ; \
done;
#========================================================================
@@ -285,14 +283,14 @@
#========================================================================
install-doc: doc
- $(mkinstalldirs) $(mandir)/mann
+ $(mkinstalldirs) $(DESTDIR)$(mandir)/mann
@echo "Installing man pages in $(mandir)"
@cd $(srcdir)/doc; for i in *.n; \
do \
echo "Installing $$i info $(mandir)/mann"; \
sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
- $$i > $(mandir)/mann/$$i; \
- chmod 444 $(mandir)/mann/$$i; \
+ $$i > $(DESTDIR)$(mandir)/mann/$$i; \
+ chmod 444 $(DESTDIR)$(mandir)/mann/$$i; \
done
test: $(TCLSH_PROG)
@@ -421,7 +419,7 @@
$(RANLIB) $(DESTDIR)$(libdir)/$$p; \
else :; fi; \
done
- $(INSTALL_DATA) pkgIndex.tcl $(pkglibdir)
+ $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
#========================================================================
# Install binary executables (e.g. .exe files)
@@ -459,7 +457,7 @@
$(mkinstalldirs) $(DESTDIR)$(libdir)
$(mkinstalldirs) $(DESTDIR)$(bindir)
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
- $(mkinstalldirs) $(ITK_LIBRARY)
+ $(mkinstalldirs) $(DESTDIR)$(ITK_LIBRARY)
.PHONY: all binaries clean depend distclean doc install installdirs \
libraries test
diff -Naur insight-6.8.orig/itcl/iwidgets/Makefile.in insight-6.8.new/itcl/iwidgets/Makefile.in
--- insight-6.8.orig/itcl/iwidgets/Makefile.in 2003-02-25 01:42:12.000000000 +0100
+++ insight-6.8.new/itcl/iwidgets/Makefile.in 2008-08-15 15:04:17.000000000 +0200
@@ -36,13 +36,13 @@
# to be different than those used for actually reference files at
# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
# when installing files.
-INSTALL_ROOT =
+INSTALL_ROOT = $(DESTDIR)
# Path name to use when installing library scripts:
# REDHAT LOCAL
#SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/lib/iwidgets$(IWIDGETS_VERSION)
-SCRIPT_INSTALL_DIR = @datadir@/iwidgets$(IWIDGETS_VERSION)
+SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)@datadir@/iwidgets$(IWIDGETS_VERSION)
# END REDHAT LOCAL
# Directory in which to install the archive libtcl.a:
diff -Naur insight-6.8.orig/tcl/unix/Makefile.in insight-6.8.new/tcl/unix/Makefile.in
--- insight-6.8.orig/tcl/unix/Makefile.in 2003-01-21 20:40:18.000000000 +0100
+++ insight-6.8.new/tcl/unix/Makefile.in 2008-08-15 12:12:33.000000000 +0200
@@ -38,7 +38,7 @@
# to be different than those used for actually reference files at
# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
# when installing files.
-INSTALL_ROOT =
+INSTALL_ROOT = $(DESTDIR)
# Path for the platform independent Tcl scripting libraries:
# REDHAT LOCAL
diff -Naur insight-6.8.orig/tk/unix/Makefile.in insight-6.8.new/tk/unix/Makefile.in
--- insight-6.8.orig/tk/unix/Makefile.in 2003-01-21 21:24:51.000000000 +0100
+++ insight-6.8.new/tk/unix/Makefile.in 2008-08-15 15:08:00.000000000 +0200
@@ -41,7 +41,7 @@
# to be different than those used for actually reference files at
# run-time. INSTALL_ROOT is prepended to $prefix and $exec_prefix
# when installing files.
-INSTALL_ROOT =
+INSTALL_ROOT = $(DESTDIR)
# Directory from which applications will reference the library of Tcl
# scripts (note: you can set the TK_LIBRARY environment variable at
insight-6.8-gcc43.patch:
--- NEW FILE insight-6.8-gcc43.patch ---
diff -Naur insight-6.8.orig/gdb/remote.c insight-6.8.new/gdb/remote.c
--- insight-6.8.orig/gdb/remote.c 2008-02-25 10:59:06.000000000 +0100
+++ insight-6.8.new/gdb/remote.c 2008-08-15 18:06:14.000000000 +0200
@@ -1703,7 +1703,7 @@
{
struct remote_state *rs = get_remote_state ();
char *limit;
- int count, resultcount, done;
+ int count, resultcount, done = 0;
resultcount = 0;
/* Assume the 'q' and 'M chars have been stripped. */
diff -Naur insight-6.8.orig/gdb/symtab.c insight-6.8.new/gdb/symtab.c
--- insight-6.8.orig/gdb/symtab.c 2008-02-05 23:17:40.000000000 +0100
+++ insight-6.8.new/gdb/symtab.c 2008-08-15 18:07:07.000000000 +0200
@@ -2275,7 +2275,7 @@
struct symtab *
find_line_symtab (struct symtab *symtab, int line, int *index, int *exact_match)
{
- int exact;
+ int exact = 0;
/* BEST_INDEX and BEST_LINETABLE identify the smallest linenumber > LINE
so far seen. */
insight-6.8-ia64bound.patch:
--- NEW FILE insight-6.8-ia64bound.patch ---
diff -Naur insight-6.8.orig/gdb/ia64-tdep.c insight-6.8.new/gdb/ia64-tdep.c
--- insight-6.8.orig/gdb/ia64-tdep.c 2008-02-20 15:31:40.000000000 +0100
+++ insight-6.8.new/gdb/ia64-tdep.c 2008-08-15 18:18:53.000000000 +0200
@@ -1234,7 +1234,7 @@
spill_reg = rN;
last_prologue_pc = next_pc;
}
- else if (qp == 0 && rM >= 32 && rM < 40 && !instores[rM] &&
+ else if (qp == 0 && rM >= 32 && rM < 40 && !instores[rM - 32] &&
rN < 256 && imm == 0)
{
/* mov rN, rM where rM is an input register */
insight-6.8-itcl33.patch:
--- NEW FILE insight-6.8-itcl33.patch ---
diff -Naur insight-6.8.orig/itcl/aclocal.m4 insight-6.8.new/itcl/aclocal.m4
--- insight-6.8.orig/itcl/aclocal.m4 2006-07-13 17:41:58.000000000 +0200
+++ insight-6.8.new/itcl/aclocal.m4 2008-08-18 18:56:35.000000000 +0200
@@ -1,480 +1,612 @@
-dnl written by Rob Savoye <rob at cygnus.com> for Cygnus Support
-dnl major rewriting for Tcl 7.5 by Don Libes <libes at nist.gov>
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
-dnl CY_AC_PATH_TCLCONFIG and CY_AC_LOAD_TCLCONFIG should be invoked
-dnl (in that order) before any other TCL macros. Similarly for TK.
-
-dnl CYGNUS LOCAL: This gets the right posix flag for gcc
-AC_DEFUN(CY_AC_TCL_LYNX_POSIX,
-[AC_REQUIRE([AC_PROG_CC])AC_REQUIRE([AC_PROG_CPP])
-AC_MSG_CHECKING([if running LynxOS])
-AC_CACHE_VAL(ac_cv_os_lynx,
-[AC_EGREP_CPP(yes,
-[/*
- * The old Lynx "cc" only defines "Lynx", but the newer one uses "__Lynx__"
- */
-#if defined(__Lynx__) || defined(Lynx)
-yes
-#endif
-], ac_cv_os_lynx=yes, ac_cv_os_lynx=no)])
-#
-if test "$ac_cv_os_lynx" = "yes" ; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(LYNX)
- AC_MSG_CHECKING([whether -mposix or -X is available])
- AC_CACHE_VAL(ac_cv_c_posix_flag,
- [AC_TRY_COMPILE(,[
- /*
- * This flag varies depending on how old the compiler is.
- * -X is for the old "cc" and "gcc" (based on 1.42).
- * -mposix is for the new gcc (at least 2.5.8).
- */
- #if defined(__GNUC__) && __GNUC__ >= 2
- choke me
- #endif
- ], ac_cv_c_posix_flag=" -mposix", ac_cv_c_posix_flag=" -X")])
- CC="$CC $ac_cv_c_posix_flag"
- AC_MSG_RESULT($ac_cv_c_posix_flag)
- else
- AC_MSG_RESULT(no)
-fi
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf. If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# Automake X.Y traces this macro to ensure aclocal.m4 has been
+# generated from the m4 files accompanying Automake X.Y.
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version. Point them to the right macro.
+m4_if([$1], [1.10], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
-#
-# Sometimes the native compiler is a bogus stub for gcc or /usr/ucb/cc. This
-# makes configure think it's cross compiling. If --target wasn't used, then
-# we can't configure, so something is wrong. We don't use the cache
-# here cause if somebody fixes their compiler install, we want this to work.
-AC_DEFUN(CY_AC_C_WORKS,
-[# If we cannot compile and link a trivial program, we can't expect anything to work
-AC_MSG_CHECKING(whether the compiler ($CC) actually works)
-AC_TRY_COMPILE(, [/* don't need anything here */],
- c_compiles=yes, c_compiles=no)
-
-AC_TRY_LINK(, [/* don't need anything here */],
- c_links=yes, c_links=no)
-
-if test x"${c_compiles}" = x"no" ; then
- AC_MSG_ERROR(the native compiler is broken and won't compile.)
-fi
-
-if test x"${c_links}" = x"no" ; then
- AC_MSG_ERROR(the native compiler is broken and won't link.)
-fi
-AC_MSG_RESULT(yes)
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too. Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
+
+# AM_SET_CURRENT_AUTOMAKE_VERSION
+# -------------------------------
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+
+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run. This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+# fails if $ac_aux_dir is absolute,
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+AC_DEFUN([AM_AUX_DIR_EXPAND],
+[dnl Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])dnl
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
])
-AC_DEFUN(CY_AC_PATH_TCLH, [
+# AM_CONDITIONAL -*- Autoconf -*-
+
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
#
-# Ok, lets find the tcl source trees so we can use the headers
-# Warning: transition of version 9 to 10 will break this algorithm
-# because 10 sorts before 9. We also look for just tcl. We have to
-# be careful that we don't match stuff like tclX by accident.
-# the alternative search directory is involked by --with-tclinclude
-#
-no_tcl=true
-AC_MSG_CHECKING(for Tcl private headers)
-AC_ARG_WITH(tclinclude, [ --with-tclinclude directory where tcl private headers are], with_tclinclude=${withval})
-AC_CACHE_VAL(ac_cv_c_tclh,[
-# first check to see if --with-tclinclude was specified
-if test x"${with_tclinclude}" != x ; then
- if test -f ${with_tclinclude}/tclInt.h ; then
- ac_cv_c_tclh=`(cd ${with_tclinclude}; pwd)`
- elif test -f ${with_tclinclude}/generic/tclInt.h ; then
- ac_cv_c_tclh=`(cd ${with_tclinclude}/generic; pwd)`
- else
- AC_MSG_ERROR([${with_tclinclude} directory doesn't contain private headers])
- fi
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
[...123986 lines suppressed...]
+ (void)getpwnam_r(uid, &pw, buf, buflen);
+ ], tcl_cv_api_getpwuid_r_4=yes, tcl_cv_api_getpwuid_r_4=no)])
+ tcl_ok=$tcl_cv_api_getpwuid_r_4
+ if test "$tcl_ok" = yes; then
+ AC_DEFINE(HAVE_GETPWUID_R_4)
+ fi
+ fi
+ if test "$tcl_ok" = yes; then
+ AC_DEFINE(HAVE_GETPWUID_R)
+ fi
+])])
+
+#--------------------------------------------------------------------
+# SC_TCL_GETPWNAM_R
+#
+# Check if we have MT-safe variant of getpwnam() and if yes,
+# which one exactly.
+#
+# Arguments:
+# None
+#
+# Results:
+#
+# Might define the following vars:
+# HAVE_GETPWNAM_R
+# HAVE_GETPWNAM_R_4
+# HAVE_GETPWNAM_R_5
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_GETPWNAM_R], [AC_CHECK_FUNC(getpwnam_r, [
+ AC_CACHE_CHECK([for getpwnam_r with 5 args], tcl_cv_api_getpwnam_r_5, [
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+ #include <pwd.h>
+ ], [
+ char *name;
+ struct passwd pw, *pwp;
+ char buf[512];
+ int buflen = 512;
+
+ (void) getpwnam_r(name, &pw, buf, buflen, &pwp);
+ ], tcl_cv_api_getpwnam_r_5=yes, tcl_cv_api_getpwnam_r_5=no)])
+ tcl_ok=$tcl_cv_api_getpwnam_r_5
+ if test "$tcl_ok" = yes; then
+ AC_DEFINE(HAVE_GETPWNAM_R_5)
+ else
+ AC_CACHE_CHECK([for getpwnam_r with 4 args], tcl_cv_api_getpwnam_r_4, [
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+ #include <pwd.h>
+ ], [
+ char *name;
+ struct passwd pw;
+ char buf[512];
+ int buflen = 512;
+
+ (void)getpwnam_r(name, &pw, buf, buflen);
+ ], tcl_cv_api_getpwnam_r_4=yes, tcl_cv_api_getpwnam_r_4=no)])
+ tcl_ok=$tcl_cv_api_getpwnam_r_4
+ if test "$tcl_ok" = yes; then
+ AC_DEFINE(HAVE_GETPWNAM_R_4)
+ fi
+ fi
+ if test "$tcl_ok" = yes; then
+ AC_DEFINE(HAVE_GETPWNAM_R)
+ fi
+])])
+
+#--------------------------------------------------------------------
+# SC_TCL_GETGRGID_R
+#
+# Check if we have MT-safe variant of getgrgid() and if yes,
+# which one exactly.
+#
+# Arguments:
+# None
+#
+# Results:
+#
+# Might define the following vars:
+# HAVE_GETGRGID_R
+# HAVE_GETGRGID_R_4
+# HAVE_GETGRGID_R_5
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_GETGRGID_R], [AC_CHECK_FUNC(getgrgid_r, [
+ AC_CACHE_CHECK([for getgrgid_r with 5 args], tcl_cv_api_getgrgid_r_5, [
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+ #include <grp.h>
+ ], [
+ gid_t gid;
+ struct group gr, *grp;
+ char buf[512];
+ int buflen = 512;
+
+ (void) getgrgid_r(gid, &gr, buf, buflen, &grp);
+ ], tcl_cv_api_getgrgid_r_5=yes, tcl_cv_api_getgrgid_r_5=no)])
+ tcl_ok=$tcl_cv_api_getgrgid_r_5
+ if test "$tcl_ok" = yes; then
+ AC_DEFINE(HAVE_GETGRGID_R_5)
+ else
+ AC_CACHE_CHECK([for getgrgid_r with 4 args], tcl_cv_api_getgrgid_r_4, [
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+ #include <grp.h>
+ ], [
+ gid_t gid;
+ struct group gr;
+ char buf[512];
+ int buflen = 512;
+
+ (void)getgrgid_r(gid, &gr, buf, buflen);
+ ], tcl_cv_api_getgrgid_r_4=yes, tcl_cv_api_getgrgid_r_4=no)])
+ tcl_ok=$tcl_cv_api_getgrgid_r_4
+ if test "$tcl_ok" = yes; then
+ AC_DEFINE(HAVE_GETGRGID_R_4)
+ fi
+ fi
+ if test "$tcl_ok" = yes; then
+ AC_DEFINE(HAVE_GETGRGID_R)
+ fi
+])])
+
+#--------------------------------------------------------------------
+# SC_TCL_GETGRNAM_R
+#
+# Check if we have MT-safe variant of getgrnam() and if yes,
+# which one exactly.
+#
+# Arguments:
+# None
+#
+# Results:
+#
+# Might define the following vars:
+# HAVE_GETGRNAM_R
+# HAVE_GETGRNAM_R_4
+# HAVE_GETGRNAM_R_5
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_GETGRNAM_R], [AC_CHECK_FUNC(getgrnam_r, [
+ AC_CACHE_CHECK([for getgrnam_r with 5 args], tcl_cv_api_getgrnam_r_5, [
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+ #include <grp.h>
+ ], [
+ char *name;
+ struct group gr, *grp;
+ char buf[512];
+ int buflen = 512;
+
+ (void) getgrnam_r(name, &gr, buf, buflen, &grp);
+ ], tcl_cv_api_getgrnam_r_5=yes, tcl_cv_api_getgrnam_r_5=no)])
+ tcl_ok=$tcl_cv_api_getgrnam_r_5
+ if test "$tcl_ok" = yes; then
+ AC_DEFINE(HAVE_GETGRNAM_R_5)
+ else
+ AC_CACHE_CHECK([for getgrnam_r with 4 args], tcl_cv_api_getgrnam_r_4, [
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+ #include <grp.h>
+ ], [
+ char *name;
+ struct group gr;
+ char buf[512];
+ int buflen = 512;
+
+ (void)getgrnam_r(name, &gr, buf, buflen);
+ ], tcl_cv_api_getgrnam_r_4=yes, tcl_cv_api_getgrnam_r_4=no)])
+ tcl_ok=$tcl_cv_api_getgrnam_r_4
+ if test "$tcl_ok" = yes; then
+ AC_DEFINE(HAVE_GETGRNAM_R_4)
+ fi
+ fi
+ if test "$tcl_ok" = yes; then
+ AC_DEFINE(HAVE_GETGRNAM_R)
+ fi
+])])
+
+#--------------------------------------------------------------------
+# SC_CONFIG_COMMANDS_PRE(CMDS)
+#
+# Replacement for autoconf 2.5x AC_COMMANDS_PRE:
+# Commands to run right before config.status is
+# created. Accumulates.
+#
+# Requires presence of SC_OUTPUT_COMMANDS_PRE at the end
+# of configure.in (right before AC_OUTPUT).
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_CONFIG_COMMANDS_PRE], [
+ define([SC_OUTPUT_COMMANDS_PRE], defn([SC_OUTPUT_COMMANDS_PRE])[$1
+])])
+AC_DEFUN([SC_OUTPUT_COMMANDS_PRE])
+
insight-6.8-lib64.patch:
--- NEW FILE insight-6.8-lib64.patch ---
diff -Naur insight-6.8.orig/gdb/acinclude.m4 insight-6.8.new/gdb/acinclude.m4
--- insight-6.8.orig/gdb/acinclude.m4 2007-03-30 14:57:42.000000000 +0200
+++ insight-6.8.new/gdb/acinclude.m4 2008-10-09 19:40:56.000000000 +0200
@@ -96,8 +96,11 @@
for i in \
`ls -dr /usr/local/src/tcl[[7-9]]* 2>/dev/null` \
`ls -dr /usr/local/lib/tcl[[7-9]]* 2>/dev/null` \
+ `ls -dr /usr/local/lib64/tcl[[7-9]]* 2>/dev/null` \
/usr/local/src/tcl \
/usr/local/lib/tcl \
+ /usr/local/lib64/tcl \
+ ${includedir} \
${prefix}/include ; do
if test -f $i/generic/tclInt.h ; then
ac_cv_c_tclh=`(cd $i/generic; pwd)`
@@ -171,7 +174,8 @@
fi
# check in a few common install locations
if test x"${ac_cv_c_tclconfig}" = x ; then
- for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
+ for i in `ls -d ${libdir} ${prefix}/lib ${prefix}/lib64 \
+ /usr/local/lib /usr/local/lib64 2>/dev/null` ; do
if test -f "$i/tclConfig.sh" ; then
ac_cv_c_tclconfig=`(cd $i; pwd)`
break
@@ -319,8 +323,11 @@
for i in \
`ls -dr /usr/local/src/tk[[4-9]]* 2>/dev/null` \
`ls -dr /usr/local/lib/tk[[4-9]]* 2>/dev/null` \
+ `ls -dr /usr/local/lib64/tk[[4-9]]* 2>/dev/null` \
/usr/local/src/tk \
/usr/local/lib/tk \
+ /usr/local/lib64/tk \
+ ${includedir} \
${prefix}/include ; do
if test -f $i/generic/tk.h ; then
ac_cv_c_tkh=`(cd $i/generic; pwd)`
@@ -394,7 +401,8 @@
fi
# check in a few common install locations
if test x"${ac_cv_c_tkconfig}" = x ; then
- for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
+ for i in `ls -d ${libdir} ${prefix}/lib ${prefix}/lib64 \
+ /usr/local/lib /usr/local/lib64 2>/dev/null` ; do
if test -f "$i/tkConfig.sh" ; then
ac_cv_c_tkconfig=`(cd $i; pwd)`
break
@@ -499,7 +507,8 @@
fi
# check in a few common install locations
if test x"${ac_cv_c_itclconfig}" = x ; then
- for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
+ for i in `ls -d ${libdir} ${prefix}/lib ${prefix}/lib64 \
+ /usr/local/lib /usr/local/lib64 2>/dev/null` ; do
if test -f "$i/itclConfig.sh" ; then
ac_cv_c_itclconfig=`(cd $i; pwd)`
break
@@ -625,7 +634,8 @@
fi
# check in a few common install locations
if test x"${ac_cv_c_itkconfig}" = x ; then
- for i in `ls -d ${prefix}/lib /usr/local/lib 2>/dev/null` ; do
+ for i in `ls -d ${libdir} ${prefix}/lib ${prefix}/lib64 \
+ /usr/local/lib /usr/local/lib64 2>/dev/null` ; do
if test -f "$i/itkConfig.sh" ; then
ac_cv_c_itkconfig=`(cd $i; pwd)`
break
@@ -827,10 +837,11 @@
dnl those with the standalone portable GNU libiconv installed).
AC_ARG_WITH([libiconv-prefix],
-[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
+[ --with-libiconv-prefix=DIR search for libiconv in DIR/{include, lib, lib64}], [
for dir in `echo "$withval" | tr : ' '`; do
if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
+ if test -d $dir/lib64; then LDFLAGS="$LDFLAGS -L$dir/lib64"; fi
done
])
insight-6.8-readline-system.patch:
--- NEW FILE insight-6.8-readline-system.patch ---
diff -Naur insight-6.8.orig/gdb/configure.ac insight-6.8.new/gdb/configure.ac
--- insight-6.8.orig/gdb/configure.ac 2008-01-13 13:23:05.000000000 +0100
+++ insight-6.8.new/gdb/configure.ac 2008-08-21 12:53:11.000000000 +0200
@@ -441,14 +441,17 @@
if test "$with_system_readline" = yes; then
READLINE=-lreadline
READLINE_DEPS=
+ READLINE_SRC='$(includedir)/readline'
READLINE_CFLAGS=
else
READLINE='$(READLINE_DIR)/libreadline.a'
READLINE_DEPS='$(READLINE)'
+ READLINE_SRC='$(srcdir)/../readline'
READLINE_CFLAGS='-I$(READLINE_SRC)/..'
fi
AC_SUBST(READLINE)
AC_SUBST(READLINE_DEPS)
+AC_SUBST(READLINE_SRC)
AC_SUBST(READLINE_CFLAGS)
AC_ARG_WITH(expat,
diff -Naur insight-6.8.orig/gdb/doc/gdb.texinfo insight-6.8.new/gdb/doc/gdb.texinfo
--- insight-6.8.orig/gdb/doc/gdb.texinfo 2008-03-26 19:38:21.000000000 +0100
+++ insight-6.8.new/gdb/doc/gdb.texinfo 2008-08-21 12:35:15.000000000 +0200
@@ -158,8 +158,8 @@
* GDB Bugs:: Reporting bugs in @value{GDBN}
-* Command Line Editing:: Command Line Editing
-* Using History Interactively:: Using History Interactively
+* Command Line Editing: (rluserman). Command Line Editing
+* Using History Interactively: (history). Using History Interactively
* Formatting Documentation:: How to format and print @value{GDBN} documentation
* Installing GDB:: Installing GDB
* Maintenance Commands:: Maintenance Commands
@@ -15863,7 +15863,7 @@
Show whether command line editing is enabled.
@end table
- at xref{Command Line Editing}, for more details about the Readline
+ at xref{Command Line Editing, , , rluserman, GNU Readline Library}, for more details about the Readline
interface. Users unfamiliar with @sc{gnu} Emacs or @code{vi} are
encouraged to read that chapter.
@@ -15878,7 +15878,8 @@
@value{GDBN} uses the @sc{gnu} History library, a part of the Readline
package, to provide the history facility. @xref{Using History
-Interactively}, for the detailed description of the History library.
+Interactively, , , history, GNU History Library}, for the detailed description
+of the History library.
To issue a command to @value{GDBN} without affecting certain aspects of
the state which is seen by users, prefix it with @samp{server }
@@ -15930,7 +15931,7 @@
@end table
History expansion assigns special meaning to the character @kbd{!}.
- at xref{Event Designators}, for more details.
+ at xref{Event Designators, , , history, GNU History Library}, for more details.
@cindex history expansion, turn on/off
Since @kbd{!} is also the logical not operator in C, history expansion
@@ -17058,7 +17059,8 @@
@cindex TUI key bindings
The TUI installs several key bindings in the readline keymaps
-(@pxref{Command Line Editing}). The following key bindings
+(@pxref{Command Line Editing, , , rluserman, GNU Readline Library}).
+The following key bindings
are installed for both TUI mode and the @value{GDBN} standard mode.
@table @kbd
@@ -22457,15 +22459,6 @@
things without first using the debugger to find the facts.
@end itemize
- at c The readline documentation is distributed with the readline code
- at c and consists of the two following files:
- at c rluser.texinfo
- at c inc-hist.texinfo
- at c Use -I with makeinfo to point to the appropriate directory,
- at c environment var TEXINPUTS with TeX.
- at include rluser.texi
- at include inc-hist.texinfo
-
@node Formatting Documentation
@appendix Formatting Documentation
@@ -22645,9 +22638,6 @@
@item gdb- at value{GDBVN}/opcodes
source for the library of opcode tables and disassemblers
- at item gdb- at value{GDBVN}/readline
-source for the @sc{gnu} command-line interface
-
@item gdb- at value{GDBVN}/glob
source for the @sc{gnu} filename pattern-matching subroutine
@@ -22679,7 +22669,7 @@
correct value by examining your system.)
Running @samp{configure @var{host}} and then running @code{make} builds the
- at file{bfd}, @file{readline}, @file{mmalloc}, and @file{libiberty}
+ at file{bfd}, @file{mmalloc}, and @file{libiberty}
libraries, then @code{gdb} itself. The configured source files, and the
binaries, are left in the corresponding source directories.
@@ -22705,7 +22695,7 @@
that subdirectory. That is usually not what you want. In particular,
if you run the first @file{configure} from the @file{gdb} subdirectory
of the @file{gdb- at var{version-number}} directory, you will omit the
-configuration of @file{bfd}, @file{readline}, and other sibling
+configuration of @file{bfd}, and other sibling
directories of the @file{gdb} subdirectory. This leads to build errors
about missing include files such as @file{bfd/bfd.h}.
diff -Naur insight-6.8.orig/gdb/doc/Makefile.in insight-6.8.new/gdb/doc/Makefile.in
--- insight-6.8.orig/gdb/doc/Makefile.in 2008-01-01 23:53:14.000000000 +0100
+++ insight-6.8.new/gdb/doc/Makefile.in 2008-08-21 12:35:14.000000000 +0200
@@ -109,9 +109,7 @@
GDB_DOC_SOURCE_INCLUDES = \
$(srcdir)/fdl.texi \
$(srcdir)/gpl.texi \
- $(srcdir)/agentexpr.texi \
- $(READLINE_DIR)/rluser.texi \
- $(READLINE_DIR)/inc-hist.texinfo
+ $(srcdir)/agentexpr.texi
GDB_DOC_BUILD_INCLUDES = \
gdb-cfg.texi \
GDBvn.texi
diff -Naur insight-6.8.orig/gdb/Makefile.in insight-6.8.new/gdb/Makefile.in
--- insight-6.8.orig/gdb/Makefile.in 2008-08-21 12:33:36.000000000 +0200
+++ insight-6.8.new/gdb/Makefile.in 2008-08-21 12:54:15.000000000 +0200
@@ -132,8 +132,7 @@
LIBDECNUMBER_CFLAGS = -I$(LIBDECNUMBER_DIR) -I$(LIBDECNUMBER_SRC)
# Where is the READLINE library? Typically in ../readline.
-READLINE_DIR = ../readline
-READLINE_SRC = $(srcdir)/$(READLINE_DIR)
+READLINE_SRC = @READLINE_SRC@
READLINE = @READLINE@
READLINE_DEPS = @READLINE_DEPS@
READLINE_CFLAGS = @READLINE_CFLAGS@
insight-6.8-relocate.patch:
--- NEW FILE insight-6.8-relocate.patch ---
diff -Naur insight-6.8.orig/gdb/gdbtk/generic/gdbtk.c insight-6.8.new/gdb/gdbtk/generic/gdbtk.c
--- insight-6.8.orig/gdb/gdbtk/generic/gdbtk.c 2008-08-19 20:23:44.000000000 +0200
+++ insight-6.8.new/gdb/gdbtk/generic/gdbtk.c 2008-08-19 20:44:08.000000000 +0200
@@ -514,7 +514,7 @@
{
static char set_gdbtk_library_script[] = "\
if {![info exists env(GDBTK_LIBRARY)]} {\n\
- set env(GDBTK_LIBRARY) [file join [file dirname [file dirname $Paths(guidir)]] insight1.0]\n\
+ set env(GDBTK_LIBRARY) [file join [file dirname [file dirname $Paths(guidir)]] insight]\n\
}\n";
command_obj = Tcl_NewStringObj (set_gdbtk_library_script, -1);
@@ -600,7 +600,7 @@
proc gdbtk_find_main {} {\n\
global Paths GDBTK_LIBRARY\n\
rename gdbtk_find_main {}\n\
- tcl_findLibrary insight 1.0 {} main.tcl GDBTK_LIBRARY GDBTKLIBRARY\n\
+ tcl_findLibrary insight {} {} main.tcl GDBTK_LIBRARY GDBTKLIBRARY\n\
set Paths(appdir) $GDBTK_LIBRARY\n\
}\n\
gdbtk_find_main";
@@ -616,7 +616,7 @@
} else {\n\
set debug_startup 0\n\
}\n\
- tcl_findLibrary insight 1.0 {} main.tcl GDBTK_LIBRARY GDBTK_LIBRARY\n\
+ tcl_findLibrary insight {} {} main.tcl GDBTK_LIBRARY GDBTK_LIBRARY\n\
set Paths(appdir) $GDBTK_LIBRARY\n\
}\n\
gdbtk_find_main";
diff -Naur insight-6.8.orig/gdb/gdbtk/library/main.tcl insight-6.8.new/gdb/gdbtk/library/main.tcl
--- insight-6.8.orig/gdb/gdbtk/library/main.tcl 2008-08-19 20:23:44.000000000 +0200
+++ insight-6.8.new/gdb/gdbtk/library/main.tcl 2008-08-19 21:15:56.000000000 +0200
@@ -38,9 +38,15 @@
lappend auto_path $GDBTK_LIBRARY
}
- # Add default plugins directory, which will be [name of exe]/../../lib/insight1.0
+ # Add default plugins directory, which will be [name of exe]/../../lib/insight
set exename [info nameofexecutable]
- set dir [file join [file dirname [file dirname $exename]] lib insight1.0]
+ set dir [file join [file dirname [file dirname $exename]] lib insight]
+ if {[file exists $dir]} {
+ lappend gdb_plugins $dir
+ lappend auto_path $dir
+ }
+ # Add extra plugins directory, which will be [name of exe]/../../share/insight
+ set dir [file join [file dirname [file dirname $exename]] share insight]
if {[file exists $dir]} {
lappend gdb_plugins $dir
lappend auto_path $dir
diff -Naur insight-6.8.orig/gdb/gdbtk/plugins/HOW-TO insight-6.8.new/gdb/gdbtk/plugins/HOW-TO
--- insight-6.8.orig/gdb/gdbtk/plugins/HOW-TO 2002-08-14 20:06:06.000000000 +0200
+++ insight-6.8.new/gdb/gdbtk/plugins/HOW-TO 2008-08-19 19:55:08.000000000 +0200
@@ -81,7 +81,7 @@
be loaded.
** FIXME: don't need to create the directory -- install will do it **
-i) First, locate the $(EXEC-PREFIX)/lib/insight1.0 directory. This is the
+i) First, locate the $(EXEC-PREFIX)/lib/insight directory. This is the
directory which contains the plug-in code used by Insight. Create a
this directory if it does not exist yet (i.e., if your plug-in
is the first to be installed).
@@ -92,7 +92,7 @@
auto_mkindex to create it. For instance, in the sample case we would
have:
- $(EXEC-PREFIX)/lib/insight1.0/rhabout
+ $(EXEC-PREFIX)/lib/insight/rhabout
** FIXME: this shows unix. show cygwin, too. **
and it would contain:
@@ -133,7 +133,7 @@
** FIXME: install will do this, too. ALL plugins should be mentioned
in the global plugins.tcl file **
v) Create/append the file "plugins.tcl" in the plugins directory
-($(EXEC-PREFIX/lib/insight1.0) if it does not yet exist. This is a file
+($(EXEC-PREFIX/lib/insight) if it does not yet exist. This is a file
shared by all plug-ins so make sure your install script does not overwrite,
but append to it.
diff -Naur insight-6.8.orig/gdb/gdbtk/plugins/Make-rules insight-6.8.new/gdb/gdbtk/plugins/Make-rules
--- insight-6.8.orig/gdb/gdbtk/plugins/Make-rules 2008-08-19 20:23:44.000000000 +0200
+++ insight-6.8.new/gdb/gdbtk/plugins/Make-rules 2008-08-19 19:55:44.000000000 +0200
@@ -104,12 +104,12 @@
install: $(INSTALL_TARGET)
install-generic:
- $(mkinstalldirs) $(libdir)/insight1.0/$(PLUGIN)
+ $(mkinstalldirs) $(libdir)/insight/$(PLUGIN)
for i in $(ALL_INSTALL); do \
- $(INSTALL_DATA) $$i $(libdir)/insight1.0/$(PLUGIN)/$$i ; \
+ $(INSTALL_DATA) $$i $(libdir)/insight/$(PLUGIN)/$$i ; \
done ;
for i in pkgIndex.tcl tclIndex $(PLUGIN_INSTALL_SRCDIR) ; do \
- $(INSTALL_DATA) $(srcdir)/$$i $(libdir)/insight1.0/$(PLUGIN)/$$i ; \
+ $(INSTALL_DATA) $(srcdir)/$$i $(libdir)/insight/$(PLUGIN)/$$i ; \
done ;
html:
diff -Naur insight-6.8.orig/gdb/gdbtk/README insight-6.8.new/gdb/gdbtk/README
--- insight-6.8.orig/gdb/gdbtk/README 2008-03-28 17:46:16.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/README 2008-08-19 19:54:25.000000000 +0200
@@ -123,7 +123,7 @@
To make more serious changes to the interface, such as adding a new window or
changing the framework, you will have to hack the tcl code (and probably the C
code as well). The tcl library install directory is $(libdir) (probably
-/usr/local/lib/insight1.0). But, you will probably want to hack on your own
+/usr/local/lib/insight). But, you will probably want to hack on your own
private copy before putting it up for the rest of the users. To find the GDB tcl
code, GDB first checks for the environment variable GDBTK_LIBRARY. GDB will check
this directory for the file "main.tcl". If GDBTK_LIBRARY is not set, GDB will
diff -Naur insight-6.8.orig/gdb/Makefile.in insight-6.8.new/gdb/Makefile.in
--- insight-6.8.orig/gdb/Makefile.in 2008-03-17 13:15:08.000000000 +0100
+++ insight-6.8.new/gdb/Makefile.in 2008-08-19 21:17:52.000000000 +0200
@@ -301,7 +301,7 @@
# The version of gdbtk we're building. This should be kept
# in sync with GDBTK_VERSION and friends in gdbtk.h.
GDBTK_VERSION = 1.0
-GDBTK_LIBRARY = $(datadir)/insight$(GDBTK_VERSION)
+GDBTK_LIBRARY = $(datadir)/insight
# Gdbtk requires an absolute path to the source directory or
# the testsuite won't run properly.
@@ -3053,10 +3053,11 @@
$(DESTDIR)$(bindir)/$$transformed_name$(EXEEXT) ; \
$(SHELL) $(srcdir)/../mkinstalldirs \
$(DESTDIR)$(GDBTK_LIBRARY) ; \
+ # Use alternate directory.
$(SHELL) $(srcdir)/../mkinstalldirs \
- $(DESTDIR)$(libdir)/insight$(GDBTK_VERSION) ; \
+ $(DESTDIR)$(datadir)/insight ; \
$(INSTALL_DATA) $(srcdir)/gdbtk/plugins/plugins.tcl \
- $(DESTDIR)$(libdir)/insight$(GDBTK_VERSION)/plugins.tcl ; \
+ $(DESTDIR)$(datadir)/insight/plugins.tcl ; \
$(SHELL) $(srcdir)/../mkinstalldirs \
$(DESTDIR)$(GDBTK_LIBRARY)/images \
$(DESTDIR)$(GDBTK_LIBRARY)/images2 ; \
diff -Naur insight-6.8.orig/libgui/library/Makefile.am insight-6.8.new/libgui/library/Makefile.am
--- insight-6.8.orig/libgui/library/Makefile.am 2008-08-19 20:23:44.000000000 +0200
+++ insight-6.8.new/libgui/library/Makefile.am 2008-08-19 19:52:49.000000000 +0200
@@ -14,7 +14,7 @@
PACKAGES = combobox.tcl
## This directory is also referenced in paths.c, which see.
-guidir = $(datadir)/redhat/gui
+guidir = $(datadir)/insight/gui
gui_DATA = tclIndex pkgIndex.tcl $(TCL) $(PACKAGES)
diff -Naur insight-6.8.orig/libgui/src/Makefile.am insight-6.8.new/libgui/src/Makefile.am
--- insight-6.8.orig/libgui/src/Makefile.am 2008-08-19 20:23:44.000000000 +0200
+++ insight-6.8.new/libgui/src/Makefile.am 2008-08-19 19:52:10.000000000 +0200
@@ -12,7 +12,7 @@
endif
datadir = @datadir@
-guidir = $(datadir)/redhat/gui
+guidir = $(datadir)/insight/gui
# tkTable version info
include $(srcdir)/tkTable_version.in
diff -Naur insight-6.8.orig/libgui/src/paths.c insight-6.8.new/libgui/src/paths.c
--- insight-6.8.orig/libgui/src/paths.c 2008-08-19 20:23:44.000000000 +0200
+++ insight-6.8.new/libgui/src/paths.c 2008-08-19 19:51:54.000000000 +0200
@@ -13,13 +13,13 @@
We first look for the gui library. This can be set by the
REDHAT_GUI_LIBRARY environment variable. Otherwise, it is named
- gui, and is found in $prefix/share/redhat, where $prefix is
+ gui, and is found in $prefix/share/insight, where $prefix is
determined by looking at the directory where the running executable
is installed.
We then look for the ide library. This can be set by the
REDHAT_IDE_LIBRARY environment variable. Otherwise, it is named
- ide, and is also found in $prefix/share/redhat.
+ ide, and is also found in $prefix/share/insight.
It is OK if only one of these libraries exist. If neither exists,
we report an error.
@@ -36,7 +36,7 @@
bitmapdir -- see below
Paths(appdir) is set based on the ide_initialize_paths APPNAME
- parameter. If a directory $prefix/share/redhat/APPNAME exists, we
+ parameter. If a directory $prefix/share/insight/APPNAME exists, we
set Paths(appdir) to it. More precisely, we set Paths(appdir) if
an APPNAME directory exists which is a sibling directory of the gui
or ide directory. For convenience of some tools, we also check for
@@ -69,13 +69,13 @@
# Handle build with --exec-prefix and build without.\n\
set d [file join [file dirname [pwd]] usr share]\n\
lappend prefdirs $d\n\
- lappend guidirs [file join $d redhat gui]\n\
+ lappend guidirs [file join $d insight gui]\n\
set d [file join [file dirname [pwd]] share]\n\
lappend prefdirs $d\n\
- lappend guidirs [file join $d redhat gui]\n\
+ lappend guidirs [file join $d insight gui]\n\
set d [file join [file dirname [file dirname [pwd]]] share]\n\
lappend prefdirs $d\n\
- lappend guidirs [file join $d redhat gui]\n\
+ lappend guidirs [file join $d insight gui]\n\
set Paths(bindir) [pwd]\n\
# Base `prefix' on where the `share' dir is found\n\
foreach sd $prefdirs {\n\
@@ -110,7 +110,7 @@
lappend idedirs $env(REDHAT_IDE_LIBRARY)\n\
}\n\
foreach d $prefdirs {\n\
- lappend idedirs [file join $d redhat ide]\n\
+ lappend idedirs [file join $d insight ide]\n\
}\n\
# Try to handle running from the build tree:\n\
lappend idedirs [file join [file dirname [file dirname $::tcl_library]] libide library]\n\
@@ -180,9 +180,9 @@
set here [pwd]\n\
cd [file dirname [info nameofexecutable]]\n\
set d [file join [file dirname [pwd]] share]\n\
- lappend guidirs [file join $d redhat gui]\n\
+ lappend guidirs [file join $d insight gui]\n\
set d [file join [file dirname [file dirname [pwd]]] share]\n\
- lappend guidirs [file join $d redhat gui]\n\
+ lappend guidirs [file join $d insight gui]\n\
lappend guidirs [file join [file dirname [file dirname $tcl_library]] libgui library]\n\
foreach sd $guidirs {\n\
if {[file exists [file join $sd tclIndex]]} {\n\
insight-6.8-syspackages.patch:
--- NEW FILE insight-6.8-syspackages.patch ---
diff -Naur insight-6.8.orig/gdb/gdbtk/generic/gdbtk.c insight-6.8.new/gdb/gdbtk/generic/gdbtk.c
--- insight-6.8.orig/gdb/gdbtk/generic/gdbtk.c 2008-03-04 00:25:03.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/generic/gdbtk.c 2008-08-18 11:49:38.000000000 +0200
@@ -1,5 +1,5 @@
/* Startup code for Insight
- Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, 2004, 2006
+ Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, 2004, 2006, 2008
Free Software Foundation, Inc.
Written by Stu Grossman <grossman at cygnus.com> of Cygnus Support.
@@ -42,8 +42,8 @@
but gdb uses stdarg.h, so make sure HAS_STDARG is defined. */
#define HAS_STDARG 1
-#include <itcl.h>
-#include <itk.h>
+#include <tcl.h>
+#include <tk.h>
#include "guitcl.h"
#include "gdbtk.h"
@@ -367,6 +367,8 @@
int element_count;
const char **exec_path;
CONST char *internal_exec_name;
+ Tcl_Obj *command_obj;
+ int running_from_builddir;
old_chain = make_cleanup (cleanup_init, 0);
@@ -381,119 +383,118 @@
if (!gdbtk_interp)
error ("Tcl_CreateInterp failed");
- /* We need to check if we are being run from
- a bin directory, if not then we may have to
- set some environment variables. */
+ /* Set up some globals used by gdb to pass info to gdbtk
+ for start up options and the like */
+ xasprintf (&s, "%d", inhibit_gdbinit);
+ Tcl_SetVar2 (gdbtk_interp, "GDBStartup", "inhibit_prefs", s, TCL_GLOBAL_ONLY);
+ free(s);
+
+ /* Note: Tcl_SetVar2() treats the value as read-only (making a
+ copy). Unfortunately it does not mark the parameter as
+ ``const''. */
+ Tcl_SetVar2 (gdbtk_interp, "GDBStartup", "host_name", (char*) host_name, TCL_GLOBAL_ONLY);
+ Tcl_SetVar2 (gdbtk_interp, "GDBStartup", "target_name", (char*) target_name, TCL_GLOBAL_ONLY);
+ {
+#ifdef __CYGWIN
+ char *srcdir = (char *) alloca (cygwin_posix_to_win32_path_list_buf_size (SRC_DIR));
+ cygwin_posix_to_win32_path_list (SRC_DIR, srcdir);
+#else /* !__CYGWIN */
+ char *srcdir = SRC_DIR;
+#endif /* !__CYGWIN */
+ Tcl_SetVar2 (gdbtk_interp, "GDBStartup", "srcdir", srcdir, TCL_GLOBAL_ONLY);
+ }
+
+ /* This is really lame, but necessary. We need to set the path to our
+ library sources in the global GDBTK_LIBRARY. This was only necessary
+ for running from the build dir, but when using a system-supplied
+ Tcl/Tk/Itcl, we cannot rely on the user installing Insight into
+ the same tcl library directory. */
internal_exec_name = Tcl_GetNameOfExecutable ();
Tcl_SplitPath ((char *) internal_exec_name, &element_count, &exec_path);
- if (strcmp (exec_path[element_count - 2], "bin") != 0)
+ if (strcmp (exec_path[element_count - 2], "bin") == 0)
+ running_from_builddir = 0;
+ else
+ running_from_builddir = 1;
+ Tcl_Free ((char *) exec_path);
+
+ /* This seems really complicated, and that's because it is.
+ We would like to preserve the following ways of running
+ Insight (and having it work, of course):
+
+ 1. Installed using installed Tcl et al
+ 2. From build directory using installed Tcl et al
+ 3. Installed using Tcl et al from the build tree
+ 4. From build directory using Tcl et al from the build tree
+
+ When running from the builddir (nos. 2,4), we set all the
+ *_LIBRARY variables manually to point at the proper locations in
+ the source tree. (When Tcl et al are installed, their
+ corresponding variables get set incorrectly, but tcl_findLibrary
+ will still find the correct installed versions.)
+
+ When not running from the build directory, we must set GDBTK_LIBRARY,
+ just in case we are running from a non-standard install directory
+ (i.e., Tcl and Insight were installed into two different
+ install directories). One snafu: we use libgui's Paths
+ environment variable to do this, so we cannot actually
+ set GDBTK_LIBRARY until libgui is initialized. */
+
+ if (running_from_builddir)
{
/* We check to see if TCL_LIBRARY, TK_LIBRARY,
- ITCL_LIBRARY, ITK_LIBRARY, TIX_LIBRARY and maybe
- a couple other environment variables have been
- set (we don't want to override the User's settings).
- If the *_LIBRARY variable is not set, point it at
- the source directory. */
-
- static char set_libs_path_script[] = "\
- set srcDir [file dirname [file dirname $env(TCL_LIBRARY)]];\n\
+ ITCL_LIBRARY, ITK_LIBRARY, and maybe a couple other
+ environment variables have been set (we don't want
+ to override the User's settings).
+
+ If the *_LIBRARY variable is is not set, point it at
+ the source directory. */
+ static char set_lib_paths_script[] = "\
+ set srcDir [file dirname $GDBStartup(srcdir)]\n\
+ if {![info exists env(TCL_LIBRARY)]} {\n\
+ set env(TCL_LIBRARY) [file join $srcDir tcl library]\n\
+ }\n\
\
- if {![info exists env(TK_LIBRARY)]} {\n\
- set env(TK_LIBRARY) [file join $srcDir tk library]\n\
- }\n\
+ if {![info exists env(TK_LIBRARY)]} {\n\
+ set env(TK_LIBRARY) [file join $srcDir tk library]\n\
+ }\n\
\
- if {![info exists env(ITCL_LIBRARY)]} {\n\
- set env(ITCL_LIBRARY) [file join $srcDir itcl itcl library]\n\
- }\n\
+ if {![info exists env(ITCL_LIBRARY)]} {\n\
+ set env(ITCL_LIBRARY) [file join $srcDir itcl itcl library]\n\
+ }\n\
\
- if {![info exists env(ITK_LIBRARY)]} {\n\
- set env(ITK_LIBRARY) [file join $srcDir itcl itk library]\n\
- }\n\
+ if {![info exists env(ITK_LIBRARY)]} {\n\
+ set env(ITK_LIBRARY) [file join $srcDir itcl itk library]\n\
+ }\n\
\
- if {![info exists env(IWIDGETS_LIBRARY)]} {\n\
- set env(IWIDGETS_LIBRARY)\
+ if {![info exists env(IWIDGETS_LIBRARY)]} {\n\
+ set env(IWIDGETS_LIBRARY) \
[file join $srcDir itcl iwidgets generic]\n\
- }\n\
-\
- if {![info exists env(GDBTK_LIBRARY)]} {\n\
- set env(GDBTK_LIBRARY) [file join $srcDir gdb gdbtk library]\n\
- }\n\
-\
- # Append the directory with the itcl pkg index\n\
- if {[info exists env(TCLLIBPATH)]} {\n\
- append env(TCLLIBPATH) :[file joing $srcDir itcl]\n\
- } else {\n\
- set env(TCLLIBPATH) [file join $srcDir itcl]\n\
}\n\
\
- # We also need to append the iwidgets library path.\n\
- # Unfortunately, there is no IWIDGETS_LIBRARY.\n\
- set IWIDGETS_LIBRARY [file join $srcDir itcl iwidgets generic]\n";
-
- Tcl_Obj *commandObj;
-
- /* Before we can run our script we must set TCL_LIBRARY. */
- if (Tcl_GetVar2 (gdbtk_interp, "env", "TCL_LIBRARY", TCL_GLOBAL_ONLY) == NULL)
- {
- int i, count;
- char *src_dir = SRC_DIR;
- const char **src_path;
- const char **lib_path;
- Tcl_DString lib_dstring;
-
- Tcl_DStringInit (&lib_dstring);
-
-#ifdef __CYGWIN__
- /* SRC_DIR from configure is a posix path. Tcl really needs a
- windows path. */
- src_dir = (char *) alloca (cygwin_posix_to_win32_path_list_buf_size (SRC_DIR));
- cygwin_posix_to_win32_path_list (SRC_DIR, src_dir);
-#endif
- Tcl_SplitPath (src_dir, &count, &src_path);
-
- /* Append tcl/library to src_dir (src_dir=/foo/bar/gdb) */
- lib_path = (const char **) alloca ((count + 2) * sizeof (char *));
- for (i = 0; i < count - 1; i++)
- lib_path[i] = src_path[i];
- lib_path[i++] = "tcl";
- lib_path[i++] = "library";
- Tcl_JoinPath (i, lib_path, &lib_dstring);
-
- /* Set TCL_LIBRARY */
- Tcl_SetVar2 (gdbtk_interp, "env", "TCL_LIBRARY",
- Tcl_DStringValue (&lib_dstring) , TCL_GLOBAL_ONLY);
- Tcl_DStringFree (&lib_dstring);
- Tcl_Free ((char *) src_path);
- }
-
- commandObj = Tcl_NewStringObj (set_libs_path_script, -1);
- Tcl_IncrRefCount (commandObj);
- Tcl_EvalObj (gdbtk_interp, commandObj);
- Tcl_DecrRefCount (commandObj);
+ if {![info exists env(GDBTK_LIBRARY)]} {\n\
+ set env(GDBTK_LIBRARY) [file join $GDBStartup(srcdir) gdbtk library]\n\
+ }\n\
+\
+ # Append the directory with the itcl/itk/iwidgets pkg indexes\n\
+ set startDir [file dirname [file dirname [info nameofexecutable]]]\n\
+ lappend ::auto_path [file join $startDir itcl itcl]\n\
+ lappend ::auto_path [file join $startDir itcl itk]\n\
+ lappend ::auto_path [file join $startDir itcl iwidgets]\n";
+
+ command_obj = Tcl_NewStringObj (set_lib_paths_script, -1);
+ Tcl_IncrRefCount (command_obj);
+ Tcl_EvalObj (gdbtk_interp, command_obj);
+ Tcl_DecrRefCount (command_obj);
}
- Tcl_Free ((char *) exec_path);
+ make_final_cleanup (gdbtk_cleanup, NULL);
if (Tcl_Init (gdbtk_interp) != TCL_OK)
error ("Tcl_Init failed: %s", gdbtk_interp->result);
- /* Set up some globals used by gdb to pass info to gdbtk
- for start up options and the like */
- xasprintf (&s, "%d", inhibit_gdbinit);
- Tcl_SetVar2 (gdbtk_interp, "GDBStartup", "inhibit_prefs", s, TCL_GLOBAL_ONLY);
- free(s);
-
- /* Note: Tcl_SetVar2() treats the value as read-only (making a
- copy). Unfortunately it does not mark the parameter as
- ``const''. */
- Tcl_SetVar2 (gdbtk_interp, "GDBStartup", "host_name", (char*) host_name, TCL_GLOBAL_ONLY);
- Tcl_SetVar2 (gdbtk_interp, "GDBStartup", "target_name", (char*) target_name, TCL_GLOBAL_ONLY);
-
- make_final_cleanup (gdbtk_cleanup, NULL);
-
/* Initialize the Paths variable. */
if (ide_initialize_paths (gdbtk_interp, "") != TCL_OK)
error ("ide_initialize_paths failed: %s", gdbtk_interp->result);
@@ -501,21 +502,27 @@
if (Tk_Init (gdbtk_interp) != TCL_OK)
error ("Tk_Init failed: %s", gdbtk_interp->result);
- if (Itcl_Init (gdbtk_interp) == TCL_ERROR)
- error ("Itcl_Init failed: %s", gdbtk_interp->result);
- Tcl_StaticPackage (gdbtk_interp, "Itcl", Itcl_Init,
- (Tcl_PackageInitProc *) NULL);
-
- if (Itk_Init (gdbtk_interp) == TCL_ERROR)
- error ("Itk_Init failed: %s", gdbtk_interp->result);
- Tcl_StaticPackage (gdbtk_interp, "Itk", Itk_Init,
- (Tcl_PackageInitProc *) NULL);
-
if (Tktable_Init (gdbtk_interp) != TCL_OK)
error ("Tktable_Init failed: %s", gdbtk_interp->result);
Tcl_StaticPackage (gdbtk_interp, "Tktable", Tktable_Init,
(Tcl_PackageInitProc *) NULL);
+
+ /* If we are not running from the build directory,
+ initialize GDBTK_LIBRARY. See comments above. */
+ if (!running_from_builddir)
+ {
+ static char set_gdbtk_library_script[] = "\
+ if {![info exists env(GDBTK_LIBRARY)]} {\n\
+ set env(GDBTK_LIBRARY) [file join [file dirname [file dirname $Paths(guidir)]] insight1.0]\n\
+ }\n";
+
+ command_obj = Tcl_NewStringObj (set_gdbtk_library_script, -1);
+ Tcl_IncrRefCount (command_obj);
+ Tcl_EvalObj (gdbtk_interp, command_obj);
+ Tcl_DecrRefCount (command_obj);
+ }
+
/*
* These are the commands to do some Windows Specific stuff...
*/
@@ -620,6 +627,7 @@
if (Tcl_GlobalEval (gdbtk_interp, (char *) script) != TCL_OK)
{
+ struct gdb_exception e;
const char *msg;
/* Force errorInfo to be set up propertly. */
@@ -631,18 +639,18 @@
If GDB wasn't started from the DOS prompt, the user won't
get to see the failure reason. */
MessageBox (NULL, msg, NULL, MB_OK | MB_ICONERROR | MB_TASKMODAL);
- {
- struct gdb_exception e;
- e.reason = RETURN_ERROR;
- e.error = GENERIC_ERROR;
- e.message = msg;
- throw_exception (e);
- }
#else
- /* FIXME: cagney/2002-04-17: Wonder what the lifetime of
- ``msg'' is - does it need a cleanup? */
- error ("%s", msg);
+ /* gdb_stdout is already pointing to OUR stdout, so we cannot
+ use *_[un]filtered here. Since we're "throwing" an exception
+ which should cause us to exit, just print out the error
+ to stderr. */
+ fputs (msg, stderr);
#endif
+
+ e.reason = RETURN_ERROR;
+ e.error = GENERIC_ERROR;
+ e.message = msg;
+ throw_exception (e);
}
/* Now source in the filename provided by the --tclcommand option.
diff -Naur insight-6.8.orig/gdb/gdbtk/generic/gdbtk-cmds.c insight-6.8.new/gdb/gdbtk/generic/gdbtk-cmds.c
--- insight-6.8.orig/gdb/gdbtk/generic/gdbtk-cmds.c 2008-03-04 00:25:03.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/generic/gdbtk-cmds.c 2008-08-18 15:36:22.000000000 +0200
@@ -1,5 +1,6 @@
/* Tcl/Tk command definitions for Insight.
- Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007
+ Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
+ 2004, 2007, 2008
Free Software Foundation, Inc.
Written by Stu Grossman <grossman at cygnus.com> of Cygnus Support.
@@ -41,12 +42,13 @@
#include "value.h"
#include "varobj.h"
#include "exceptions.h"
+#include "language.h"
+#include "target.h"
/* tcl header files includes varargs.h unless HAS_STDARG is defined,
but gdb uses stdarg.h, so make sure HAS_STDARG is defined. */
#define HAS_STDARG 1
-#include <itcl.h>
#include <tcl.h>
#include <tk.h>
@@ -567,7 +569,7 @@
else
{
if (target_stop != target_ignore)
- target_stop ();
+ target_stop ();
else
quit_flag = 1; /* hope something sees this */
}
@@ -1888,7 +1890,7 @@
for (i = 0; i < 3; i++)
Tcl_SetObjLength (client_data->result_obj[i], 0);
- deprecated_print_address_numeric (pc, 1, gdb_stdout);
+ fputs_filtered(paddress(pc), gdb_stdout);
gdb_flush (gdb_stdout);
result_ptr->obj_ptr = client_data->result_obj[1];
@@ -3004,8 +3006,6 @@
* with something similar, but different enough to break
* Insight.
*/
-int find_and_open_source (struct objfile *objfile, const char *filename,
- const char *dirname, char **fullname);
char *
symtab_to_filename (struct symtab *s)
@@ -3018,8 +3018,7 @@
/* Don't check s->fullname here, the file could have been
deleted/moved/..., look for it again */
- r = find_and_open_source (s->objfile, s->filename, s->dirname,
- &s->fullname);
+ r = open_source_file(s);
if (r)
close (r);
diff -Naur insight-6.8.orig/gdb/gdbtk/generic/gdbtk.h insight-6.8.new/gdb/gdbtk/generic/gdbtk.h
--- insight-6.8.orig/gdb/gdbtk/generic/gdbtk.h 2005-12-23 19:23:16.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/generic/gdbtk.h 2008-08-18 15:38:17.000000000 +0200
@@ -1,5 +1,5 @@
/* Tcl/Tk interface routines header file.
- Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2003
+ Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2003, 2008
Free Software Foundation, Inc.
Written by Stu Grossman <grossman at cygnus.com> of Cygnus Support.
diff -Naur insight-6.8.orig/gdb/gdbtk/generic/gdbtk-hooks.c insight-6.8.new/gdb/gdbtk/generic/gdbtk-hooks.c
--- insight-6.8.orig/gdb/gdbtk/generic/gdbtk-hooks.c 2008-03-04 00:25:03.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/generic/gdbtk-hooks.c 2008-08-18 15:37:29.000000000 +0200
@@ -1,6 +1,6 @@
/* Startup code for Insight.
- Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 200, 2002, 2003, 2004
+ Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 200, 2002, 2003, 2004, 2008
Free Software Foundation, Inc.
Written by Stu Grossman <grossman at cygnus.com> of Cygnus Support.
@@ -43,7 +43,6 @@
but gdb uses stdarg.h, so make sure HAS_STDARG is defined. */
#define HAS_STDARG 1
-#include <itcl.h>
#include <tcl.h>
#include <tk.h>
#include "guitcl.h"
diff -Naur insight-6.8.orig/gdb/gdbtk/generic/gdbtk-stack.c insight-6.8.new/gdb/gdbtk/generic/gdbtk-stack.c
--- insight-6.8.orig/gdb/gdbtk/generic/gdbtk-stack.c 2008-08-15 17:52:50.000000000 +0200
+++ insight-6.8.new/gdb/gdbtk/generic/gdbtk-stack.c 2008-08-18 12:32:49.000000000 +0200
@@ -116,16 +116,11 @@
{
case LOC_ARG: /* argument */
case LOC_REF_ARG: /* reference arg */
- case LOC_REGPARM: /* register arg */
case LOC_REGPARM_ADDR: /* indirect register arg */
- case LOC_LOCAL_ARG: /* stack arg */
- case LOC_BASEREG_ARG: /* basereg arg */
case LOC_LOCAL: /* stack local */
- case LOC_BASEREG: /* basereg local */
case LOC_STATIC: /* static */
case LOC_REGISTER: /* register */
case LOC_COMPUTED: /* computed location */
- case LOC_COMPUTED_ARG: /* computed location arg */
Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
Tcl_NewStringObj (DEPRECATED_SYMBOL_NAME (sym),
-1));
@@ -196,14 +191,9 @@
case LOC_ARG: /* argument */
case LOC_REF_ARG: /* reference arg */
- case LOC_REGPARM: /* register arg */
case LOC_REGPARM_ADDR: /* indirect register arg */
- case LOC_LOCAL_ARG: /* stack arg */
- case LOC_BASEREG_ARG: /* basereg arg */
- case LOC_COMPUTED_ARG: /* computed location arg */
case LOC_LOCAL: /* stack local */
- case LOC_BASEREG: /* basereg local */
case LOC_STATIC: /* static */
case LOC_REGISTER: /* register */
case LOC_COMPUTED: /* computed location */
@@ -348,17 +338,12 @@
break;
case LOC_ARG: /* argument */
case LOC_REF_ARG: /* reference arg */
- case LOC_REGPARM: /* register arg */
case LOC_REGPARM_ADDR: /* indirect register arg */
- case LOC_LOCAL_ARG: /* stack arg */
- case LOC_BASEREG_ARG: /* basereg arg */
- case LOC_COMPUTED_ARG: /* computed location arg */
if (arguments)
Tcl_ListObjAppendElement (interp, result_ptr->obj_ptr,
Tcl_NewStringObj (DEPRECATED_SYMBOL_NAME (sym), -1));
break;
case LOC_LOCAL: /* stack local */
- case LOC_BASEREG: /* basereg local */
case LOC_STATIC: /* static */
case LOC_REGISTER: /* register */
case LOC_COMPUTED: /* computed location */
diff -Naur insight-6.8.orig/gdb/gdbtk/generic/gdbtk-varobj.c insight-6.8.new/gdb/gdbtk/generic/gdbtk-varobj.c
--- insight-6.8.orig/gdb/gdbtk/generic/gdbtk-varobj.c 2008-02-05 15:07:06.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/generic/gdbtk-varobj.c 2008-08-18 15:41:24.000000000 +0200
@@ -447,21 +447,21 @@
/* varobj_update() throws an error for a non-root variable
and otherwise it returns a value < 0 if the variable is
- not in scope, not valid anymore or has changed type. */
+ not in scope, not valid anymore or has changed type. */
if (GDB_varobj_update (var, &changelist, 1, &result) != GDB_OK || result < 0)
return Tcl_NewStringObj ("-1", -1);
- changed = Tcl_NewListObj (0, NULL);
+ changed = Tcl_NewListObj (0, NULL);
vc = changelist;
while (*vc != NULL)
{
/* Add changed variable object to result list */
- Tcl_ListObjAppendElement (NULL, changed,
- Tcl_NewStringObj (varobj_get_objname (*vc), -1));
+ Tcl_ListObjAppendElement(NULL, changed,
+ Tcl_NewStringObj(varobj_get_objname(*vc), -1));
vc++;
}
- xfree (changelist);
+ xfree(changelist);
return changed;
}
diff -Naur insight-6.8.orig/gdb/gdbtk/generic/gdbtk-wrapper.c insight-6.8.new/gdb/gdbtk/generic/gdbtk-wrapper.c
--- insight-6.8.orig/gdb/gdbtk/generic/gdbtk-wrapper.c 2008-03-07 09:03:19.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/generic/gdbtk-wrapper.c 2008-08-18 15:51:08.000000000 +0200
@@ -1,5 +1,5 @@
/* longjmp-free interface between gdb and gdbtk.
- Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2002, 2008 Free Software Foundation, Inc.
This file is part of GDB.
diff -Naur insight-6.8.orig/gdb/gdbtk/generic/gdbtk-wrapper.h insight-6.8.new/gdb/gdbtk/generic/gdbtk-wrapper.h
--- insight-6.8.orig/gdb/gdbtk/generic/gdbtk-wrapper.h 2008-03-07 09:03:19.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/generic/gdbtk-wrapper.h 2008-08-18 15:30:32.000000000 +0200
@@ -1,5 +1,5 @@
/* longjmp-free interface between gdb and gdbtk.
- Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2002, 2008 Free Software Foundation, Inc.
This file is part of GDB. It contains routines to safely call common gdb
functions without the fear of longjmp'ing.
diff -Naur insight-6.8.orig/gdb/gdbtk/library/ehandler.itb insight-6.8.new/gdb/gdbtk/library/ehandler.itb
--- insight-6.8.orig/gdb/gdbtk/library/ehandler.itb 2005-12-23 19:26:50.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/library/ehandler.itb 2008-08-18 11:32:17.000000000 +0200
@@ -22,7 +22,7 @@
set handler [$event handler]
# invoke event handlers
- foreach w [itcl_info objects -isa GDBEventHandler] {
+ foreach w [itcl::find objects -isa GDBEventHandler] {
dbug I "posting event \"$handler\" to \"$w\""
if {[catch {$w $handler $event}]} {
dbug E "On $handler event, $w errored:\n$::errorInfo"
diff -Naur insight-6.8.orig/gdb/gdbtk/library/globalpref.itb insight-6.8.new/gdb/gdbtk/library/globalpref.itb
--- insight-6.8.orig/gdb/gdbtk/library/globalpref.itb 2008-02-09 02:23:42.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/library/globalpref.itb 2008-08-18 11:32:17.000000000 +0200
@@ -173,7 +173,8 @@
if {[winfo exists .c]} { destroy .c }
}
- Labelledframe $frame.d -text "Fonts"
+ set f [Labelledframe $frame.d]
+ $f configure -text "Fonts"
set f [$frame.d get_frame]
_make_font_item $f fixed "Fixed Font:" $font_cache
diff -Naur insight-6.8.orig/gdb/gdbtk/library/main.tcl insight-6.8.new/gdb/gdbtk/library/main.tcl
--- insight-6.8.orig/gdb/gdbtk/library/main.tcl 2008-02-09 02:23:42.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/library/main.tcl 2008-08-18 11:52:42.000000000 +0200
@@ -57,7 +57,7 @@
# Require the packages we need. Most are loaded already, but this will catch
# any odd errors... :
-foreach p {{Tcl 8.0} {Tk 8.0} {Itcl 3.0} {Itk 3.0} {Gdbtk 1.0} {combobox 2.2} {debug 1.0}} {
+foreach p {{Tcl 8.4} {Tk 8.4} {Itcl 3.3} {Itk 3.3} {Iwidgets 4.0} {Gdbtk 1.0} {combobox 2.2} {debug 1.0}} {
if {[catch {package require [lindex $p 0] [lindex $p 1]} msg]} {
if {![info exists ::env(GDBTK_TEST_RUNNING)] || $::env(GDBTK_TEST_RUNNING) == 0} {
if {$::tcl_platform(platform) != "windows"} {
@@ -74,21 +74,6 @@
namespace import itcl::*
namespace import debug::*
-# Finally, load Iwidgets
-if {[info exists IWIDGETS_LIBRARY]} {
- lappend auto_path $IWIDGETS_LIBRARY
-}
-if {[catch {package require Iwidgets} msg]} {
- if {![info exists ::env(GDBTK_TEST_RUNNING)] || $::env(GDBTK_TEST_RUNNING) == 0} {
- if {$::tcl_platform(platform) != "windows"} {
- puts stderr "Error: $msg"
- }
- catch {tk_messageBox -title Error -message $msg -icon error -type ok}
- }
- exit -1
-}
-
-
# Environment variables controlling debugging:
# GDBTK_TRACE
# unset or 0 no tracing
diff -Naur insight-6.8.orig/gdb/gdbtk/library/managedwin.itb insight-6.8.new/gdb/gdbtk/library/managedwin.itb
--- insight-6.8.orig/gdb/gdbtk/library/managedwin.itb 2008-02-09 02:23:42.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/library/managedwin.itb 2008-08-18 11:32:17.000000000 +0200
@@ -75,7 +75,7 @@
# ------------------------------------------------------------
itcl::body ManagedWin::window_instance {ins} {
set win_instance $ins
- foreach obj [itcl_info objects -isa ManagedWin] {
+ foreach obj [itcl::find objects -isa ManagedWin] {
debug "$obj ManagedWin::_wname"
$obj window_name ""
}
@@ -133,7 +133,7 @@
after idle gdbtk_idle
# call the reconfig method for each object
- foreach obj [itcl_info objects -isa ManagedWin] {
+ foreach obj [itcl::find objects -isa ManagedWin] {
if {[catch {$obj reconfig} msg]} {
dbug W "reconfig failed for $obj - $msg"
}
@@ -147,7 +147,7 @@
# ------------------------------------------------------------------
itcl::body ManagedWin::shutdown {} {
set activeWins {}
- foreach win [itcl_info objects -isa ManagedWin] {
+ foreach win [itcl::find objects -isa ManagedWin] {
if {![$win isa ModalDialog] && ![$win _ignore_on_save]} {
set g [wm geometry [winfo toplevel [namespace tail $win]]]
pref setd gdb/geometry/[namespace tail $win] $g
@@ -220,7 +220,7 @@
if {!$force} {
# check all windows for one of this type
- foreach obj [itcl_info objects -isa ManagedWin] {
+ foreach obj [itcl::find objects -isa ManagedWin] {
if {[$obj isa $class]} {
$obj reveal
return $obj
@@ -363,7 +363,7 @@
itcl::body ManagedWin::find { win } {
debug "$win"
set res ""
- foreach obj [itcl_info objects -isa ManagedWin] {
+ foreach obj [itcl::find objects -isa ManagedWin] {
if {[$obj isa $win]} {
lappend res $obj
}
diff -Naur insight-6.8.orig/gdb/gdbtk/library/srcpref.itb insight-6.8.new/gdb/gdbtk/library/srcpref.itb
--- insight-6.8.orig/gdb/gdbtk/library/srcpref.itb 2005-12-23 19:26:50.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/library/srcpref.itb 2008-08-18 11:32:17.000000000 +0200
@@ -1,5 +1,5 @@
# Source preferences dialog for Insight.
-# Copyright (C) 1998, 1999, 2002, 2003 Red Hat
+# Copyright (C) 1998, 1999, 2002, 2003, 2008 Red Hat
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License (GPL) as published by
@@ -49,7 +49,8 @@
set f $itk_interior.f.a
# Colors frame
- Labelledframe $f.colors -anchor nw -text {Colors}
+ set a [Labelledframe $f.colors]
+ $a configure -anchor nw -text {Colors}
set w [$f.colors get_frame]
set color [pref get gdb/src/PC_TAG]
@@ -100,7 +101,8 @@
frame $f.rmv
# Debug Mode frame
- Labelledframe $f.rmv.mode -anchor nw -text "Mouse Button-1 Behavior"
+ set a [Labelledframe $f.rmv.mode]
+ $a configure -anchor nw -text "Mouse Button-1 Behavior"
set w [$f.rmv.mode get_frame]
if {[pref get gdb/mode]} {
@@ -118,7 +120,8 @@
pack $w.async $w.sync -side top
# Variable Balloons
- Labelledframe $f.rmv.var -anchor nw -text "Variable Balloons"
+ set a [Labelledframe $f.rmv.var]
+ $a configure -anchor nw -text "Variable Balloons"
set w [$f.rmv.var get_frame]
set var _new(gdb/src/variableBalloons)
radiobutton $w.var_on -text "On " -variable [scope $var] -value 1
diff -Naur insight-6.8.orig/gdb/gdbtk/library/targetselection.itb insight-6.8.new/gdb/gdbtk/library/targetselection.itb
--- insight-6.8.orig/gdb/gdbtk/library/targetselection.itb 2008-03-04 00:25:03.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/library/targetselection.itb 2008-08-18 12:53:37.000000000 +0200
@@ -44,6 +44,12 @@
}
set db_inited 1
+ # We really need to have the preferences defined, too,
+ # otherwise set_target and company won't work properly
+ # unless the user has first opened a TargetSelection dialog.
+
+ _init_prefs
+
# Target Database
# Set the following members:
# TARGET,pretty-name: Name to display to user
@@ -323,6 +329,7 @@
pref define gdb/load/default-port [default_port]
pref define gdb/load/default-hostname ""
pref define gdb/load/default-after_attaching {}
+ pref define gdb/load/default_portname 32767
}
itcl::body TargetSelection::_init_target {} {
@@ -371,7 +378,6 @@
set trace_inited 1
init_target_db ;# initialize database
- _init_prefs ;# initialize load prefs
_init_target ;# initialize target prefs
set_saved
diff -Naur insight-6.8.orig/gdb/gdbtk/plugins/acinclude.m4 insight-6.8.new/gdb/gdbtk/plugins/acinclude.m4
--- insight-6.8.orig/gdb/gdbtk/plugins/acinclude.m4 2002-08-14 20:06:06.000000000 +0200
+++ insight-6.8.new/gdb/gdbtk/plugins/acinclude.m4 2008-08-18 11:32:17.000000000 +0200
@@ -1 +1 @@
-"sinclude(../../../config/acinclude.m4)"
+"sinclude(../../../config/tcl.m4)"
diff -Naur insight-6.8.orig/gdb/gdbtk/plugins/configure.ac insight-6.8.new/gdb/gdbtk/plugins/configure.ac
--- insight-6.8.orig/gdb/gdbtk/plugins/configure.ac 2005-01-13 23:30:57.000000000 +0100
+++ insight-6.8.new/gdb/gdbtk/plugins/configure.ac 2008-08-18 11:32:17.000000000 +0200
@@ -9,13 +9,31 @@
AC_EXEEXT
# Find Tcl, Tk, etc
-CYG_AC_PATH_TCLCONFIG
-CYG_AC_LOAD_TCLCONFIG
-CYG_AC_PATH_TKCONFIG
-CYG_AC_LOAD_TKCONFIG
-CYG_AC_PATH_TCLH
-CYG_AC_PATH_TKH
+SC_PATH_TCLCONFIG
+SC_LOAD_TCLCONFIG
+SC_PATH_TKCONFIG
+SC_LOAD_TKCONFIG
+
+# Special in-tree hackery
+here=`pwd`
+cd ${srcdir}/../../..
+topdir=`pwd`
+cd ${here}
+
+if test "${TCL_SRC_DIR}" = "${topdir}/tcl"; then
+ TCL_INCLUDES="-I${TCL_SRC_DIR}/generic"
+ TCL_LIBRARY="${TCL_BUILD_LIB_SPEC}"
+else
+ TCL_INCLUDES="${TCL_INCLUDE_SPEC}"
+ TCL_LIBRARY="${TCL_LIB_SPEC}"
+fi
+
AC_SUBST(TCL_DBGX)
+AC_SUBST(TCL_SHLIB_CFLAGS)
+AC_SUBST(TCL_SHLIB_LD)
+AC_SUBST(TCL_SHLIB_SUFFIX)
+AC_SUBST(TCL_INCLUDES)
+AC_SUBST(TCL_LIBRARY)
# Make sure TCL_SHLIB_SUFFIX is set
if test x$TCL_SHLIB_SUFFIX = x ; then
diff -Naur insight-6.8.orig/gdb/gdbtk/plugins/Makefile.in insight-6.8.new/gdb/gdbtk/plugins/Makefile.in
--- insight-6.8.orig/gdb/gdbtk/plugins/Makefile.in 2006-09-29 06:47:41.000000000 +0200
+++ insight-6.8.new/gdb/gdbtk/plugins/Makefile.in 2008-08-18 11:55:34.000000000 +0200
@@ -46,7 +46,7 @@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/../../../config/acinclude.m4 \
+ $(top_srcdir)/../../../config/tcl.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -79,7 +79,6 @@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -88,7 +87,6 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-EGREP = @EGREP@
EXEEXT = @EXEEXT@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -116,35 +114,31 @@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-TCLCONFIG = @TCLCONFIG@
-TCLHDIR = @TCLHDIR@
TCL_BIN_DIR = @TCL_BIN_DIR@
-TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
-TCL_CFLAGS = @TCL_CFLAGS@
TCL_DBGX = @TCL_DBGX@
-TCL_DEFS = @TCL_DEFS@
-TCL_LD_FLAGS = @TCL_LD_FLAGS@
-TCL_LD_SEARCH_FLAGS = @TCL_LD_SEARCH_FLAGS@
-TCL_LIBS = @TCL_LIBS@
+TCL_INCLUDES = @TCL_INCLUDES@
+TCL_LIBRARY = @TCL_LIBRARY@
TCL_LIB_FILE = @TCL_LIB_FILE@
-TCL_LIB_FULL_PATH = @TCL_LIB_FULL_PATH@
+TCL_LIB_FLAG = @TCL_LIB_FLAG@
TCL_LIB_SPEC = @TCL_LIB_SPEC@
-TCL_RANLIB = @TCL_RANLIB@
+TCL_PATCH_LEVEL = @TCL_PATCH_LEVEL@
TCL_SHLIB_CFLAGS = @TCL_SHLIB_CFLAGS@
TCL_SHLIB_LD = @TCL_SHLIB_LD@
TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
-TKCONFIG = @TKCONFIG@
-TKHDIR = @TKHDIR@
-TK_BUILD_INCLUDES = @TK_BUILD_INCLUDES@
-TK_BUILD_LIB_SPEC = @TK_BUILD_LIB_SPEC@
-TK_DEFS = @TK_DEFS@
-TK_LIBS = @TK_LIBS@
+TCL_SRC_DIR = @TCL_SRC_DIR@
+TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@
+TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@
+TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
+TCL_VERSION = @TCL_VERSION@
+TK_BIN_DIR = @TK_BIN_DIR@
TK_LIB_FILE = @TK_LIB_FILE@
-TK_LIB_FULL_PATH = @TK_LIB_FULL_PATH@
+TK_LIB_FLAG = @TK_LIB_FLAG@
TK_LIB_SPEC = @TK_LIB_SPEC@
+TK_SRC_DIR = @TK_SRC_DIR@
+TK_STUB_LIB_FILE = @TK_STUB_LIB_FILE@
+TK_STUB_LIB_FLAG = @TK_STUB_LIB_FLAG@
+TK_STUB_LIB_SPEC = @TK_STUB_LIB_SPEC@
TK_VERSION = @TK_VERSION@
-TK_XINCLUDES = @TK_XINCLUDES@
-TK_XLIBSW = @TK_XLIBSW@
VERSION = @VERSION@
ac_ct_AS = @ac_ct_AS@
ac_ct_CC = @ac_ct_CC@
diff -Naur insight-6.8.orig/gdb/gdbtk/plugins/Make-rules insight-6.8.new/gdb/gdbtk/plugins/Make-rules
--- insight-6.8.orig/gdb/gdbtk/plugins/Make-rules 2007-07-26 15:05:35.000000000 +0200
+++ insight-6.8.new/gdb/gdbtk/plugins/Make-rules 2008-08-18 11:32:17.000000000 +0200
@@ -35,8 +35,8 @@
TCL_SHLIB_LD = @TCL_SHLIB_LD@
TCL_DBGX = @TCL_DBGX@
TCL_SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
-TCL_INCLUDES = @TCLHDIR@
-TCL_BUILD_LIB_SPEC = @TCL_BUILD_LIB_SPEC@
+TCL_INCLUDES = @TCL_INCLUDES@
+TCL_LIBRARY = @TCL_LIBRARY@
mkinstalldirs = $(srcdir)/../../../../mkinstalldirs
INSTALL = @INSTALL@
@@ -62,7 +62,7 @@
ALL_TARGETS = $(PLUGIN_MODULE) $(GENERIC_TARGETS) $(PLUGIN_TARGETS)
endif
-GENERIC_SHLIB_LIBS = $(TCL_BUILD_LIB_SPEC)
+GENERIC_SHLIB_LIBS = $(TCL_LIBRARY)
CYGWIN_DLL_LIBS = $(PLUGIN_CYGWIN_LIBS) @LIBCYGWIN_A@
ALL_SHLIB_LIBS = $(GENERIC_SHLIB_LIBS) $(PLUGIN_SHLIB_LIBS)
diff -Naur insight-6.8.orig/tcl/compat/strstr.c insight-6.8.new/tcl/compat/strstr.c
--- insight-6.8.orig/tcl/compat/strstr.c 2003-01-21 20:39:57.000000000 +0100
+++ insight-6.8.new/tcl/compat/strstr.c 2008-08-18 12:18:38.000000000 +0200
@@ -12,6 +12,11 @@
* RCS: @(#) $Id: strstr.c,v 1.3 2002/01/26 01:10:08 dgp Exp $
*/
+#include "tcl.h"
+#ifndef NULL
+#define NULL 0
+#endif
+
/*
*----------------------------------------------------------------------
*
insight-6.8-tclm4.patch:
--- NEW FILE insight-6.8-tclm4.patch ---
diff -Naur insight-6.8.orig/config/tcl.m4 insight-6.8.new/config/tcl.m4
--- insight-6.8.orig/config/tcl.m4 1970-01-01 01:00:00.000000000 +0100
+++ insight-6.8.new/config/tcl.m4 2008-10-08 19:28:14.000000000 +0200
@@ -0,0 +1,2438 @@
+#------------------------------------------------------------------------
+# SC_PATH_TCLCONFIG --
+#
+# Locate the tclConfig.sh file and perform a sanity check on
+# the Tcl compile flags
+#
+# Arguments:
+# none
+#
+# Results:
+#
+# Adds the following arguments to configure:
+# --with-tcl=...
+#
+# Defines the following vars:
+# TCL_BIN_DIR Full path to the directory containing
+# the tclConfig.sh file
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_PATH_TCLCONFIG], [
+ #
+ # Ok, lets find the tcl configuration
+ # First, look for one uninstalled.
+ # the alternative search directory is invoked by --with-tcl
+ #
+
+ if test x"${no_tcl}" = x ; then
+ # we reset no_tcl in case something fails here
+ no_tcl=true
+ AC_ARG_WITH(tcl, [ --with-tcl directory containing tcl configuration (tclConfig.sh)], with_tclconfig=${withval})
+ AC_MSG_CHECKING([for Tcl configuration])
+ AC_CACHE_VAL(ac_cv_c_tclconfig,[
+
+ # First check to see if --with-tcl was specified.
+ if test x"${with_tclconfig}" != x ; then
+ if test -f "${with_tclconfig}/tclConfig.sh" ; then
+ ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
+ else
+ AC_MSG_ERROR([${with_tclconfig} directory doesn't contain tclConfig.sh])
+ fi
+ fi
+
+ # then check for a private Tcl installation
+ if test x"${ac_cv_c_tclconfig}" = x ; then
+ for i in \
+ ../tcl \
+ `ls -dr ../tcl[[8-9]].[[0-9]]* 2>/dev/null` \
+ ../../tcl \
+ `ls -dr ../../tcl[[8-9]].[[0-9]]* 2>/dev/null` \
+ ../../../tcl \
+ `ls -dr ../../../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do
+ if test -f "$i/unix/tclConfig.sh" ; then
+ ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
+ break
+ fi
+ done
+ fi
+
+ # check in a few common install locations
+ if test x"${ac_cv_c_tclconfig}" = x ; then
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d /usr/local/lib 2>/dev/null` \
+ `ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/lib 2>/dev/null` \
+ ; do
+ if test -f "$i/tclConfig.sh" ; then
+ ac_cv_c_tclconfig=`(cd $i; pwd)`
+ break
+ fi
+ done
+ fi
+
+ # check in a few other private locations
+ if test x"${ac_cv_c_tclconfig}" = x ; then
+ for i in \
+ ${srcdir}/../tcl \
+ `ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]]* 2>/dev/null` ; do
+ if test -f "$i/unix/tclConfig.sh" ; then
+ ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
+ break
+ fi
+ done
+ fi
+ ])
+
+ if test x"${ac_cv_c_tclconfig}" = x ; then
+ TCL_BIN_DIR="# no Tcl configs found"
+ AC_MSG_WARN(Can't find Tcl configuration definitions)
+ exit 0
+ else
+ no_tcl=
+ TCL_BIN_DIR=${ac_cv_c_tclconfig}
+ AC_MSG_RESULT(found $TCL_BIN_DIR/tclConfig.sh)
+ fi
+ fi
+])
+
+#------------------------------------------------------------------------
+# SC_PATH_TKCONFIG --
+#
+# Locate the tkConfig.sh file
+#
+# Arguments:
+# none
+#
+# Results:
+#
+# Adds the following arguments to configure:
+# --with-tk=...
+#
+# Defines the following vars:
+# TK_BIN_DIR Full path to the directory containing
+# the tkConfig.sh file
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_PATH_TKCONFIG], [
+ #
+ # Ok, lets find the tk configuration
+ # First, look for one uninstalled.
+ # the alternative search directory is invoked by --with-tk
+ #
+
+ if test x"${no_tk}" = x ; then
+ # we reset no_tk in case something fails here
+ no_tk=true
+ AC_ARG_WITH(tk, [ --with-tk directory containing tk configuration (tkConfig.sh)], with_tkconfig=${withval})
+ AC_MSG_CHECKING([for Tk configuration])
+ AC_CACHE_VAL(ac_cv_c_tkconfig,[
+
+ # First check to see if --with-tkconfig was specified.
+ if test x"${with_tkconfig}" != x ; then
+ if test -f "${with_tkconfig}/tkConfig.sh" ; then
+ ac_cv_c_tkconfig=`(cd ${with_tkconfig}; pwd)`
+ else
+ AC_MSG_ERROR([${with_tkconfig} directory doesn't contain tkConfig.sh])
+ fi
+ fi
+
+ # then check for a private Tk library
+ if test x"${ac_cv_c_tkconfig}" = x ; then
+ for i in \
+ ../tk \
+ `ls -dr ../tk[[8-9]].[[0-9]]* 2>/dev/null` \
+ ../../tk \
+ `ls -dr ../../tk[[8-9]].[[0-9]]* 2>/dev/null` \
+ ../../../tk \
+ `ls -dr ../../../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do
+ if test -f "$i/unix/tkConfig.sh" ; then
+ ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
+ break
+ fi
+ done
+ fi
+ # check in a few common install locations
+ if test x"${ac_cv_c_tkconfig}" = x ; then
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d /usr/local/lib 2>/dev/null` \
+ `ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/lib 2>/dev/null` \
+ ; do
+ if test -f "$i/tkConfig.sh" ; then
+ ac_cv_c_tkconfig=`(cd $i; pwd)`
+ break
+ fi
+ done
+ fi
+ # check in a few other private locations
+ if test x"${ac_cv_c_tkconfig}" = x ; then
+ for i in \
+ ${srcdir}/../tk \
+ `ls -dr ${srcdir}/../tk[[8-9]].[[0-9]]* 2>/dev/null` ; do
+ if test -f "$i/unix/tkConfig.sh" ; then
+ ac_cv_c_tkconfig=`(cd $i/unix; pwd)`
+ break
+ fi
+ done
+ fi
+ ])
+ if test x"${ac_cv_c_tkconfig}" = x ; then
+ TK_BIN_DIR="# no Tk configs found"
+ AC_MSG_WARN(Can't find Tk configuration definitions)
+ exit 0
+ else
+ no_tk=
+ TK_BIN_DIR=${ac_cv_c_tkconfig}
+ AC_MSG_RESULT(found $TK_BIN_DIR/tkConfig.sh)
+ fi
+ fi
+
+])
+
+#------------------------------------------------------------------------
+# SC_LOAD_TCLCONFIG --
+#
+# Load the tclConfig.sh file
[...2043 lines suppressed...]
+])
+
+#--------------------------------------------------------------------
+# SC_TCL_LINK_LIBS
+#
+# Search for the libraries needed to link the Tcl shell.
+# Things like the math library (-lm) and socket stuff (-lsocket vs.
+# -lnsl) are dealt with here.
+#
+# Arguments:
+# Requires the following vars to be set in the Makefile:
+# DL_LIBS
+# LIBS
+# MATH_LIBS
+#
+# Results:
+#
+# Subst's the following var:
+# TCL_LIBS
+# MATH_LIBS
+#
+# Might append to the following vars:
+# LIBS
+#
+# Might define the following vars:
+# HAVE_NET_ERRNO_H
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_LINK_LIBS], [
+ #--------------------------------------------------------------------
+ # On a few very rare systems, all of the libm.a stuff is
+ # already in libc.a. Set compiler flags accordingly.
+ # Also, Linux requires the "ieee" library for math to work
+ # right (and it must appear before "-lm").
+ #--------------------------------------------------------------------
+
+ AC_CHECK_FUNC(sin, MATH_LIBS="", MATH_LIBS="-lm")
+ AC_CHECK_LIB(ieee, main, [MATH_LIBS="-lieee $MATH_LIBS"])
+
+ #--------------------------------------------------------------------
+ # Interactive UNIX requires -linet instead of -lsocket, plus it
+ # needs net/errno.h to define the socket-related error codes.
+ #--------------------------------------------------------------------
+
+ AC_CHECK_LIB(inet, main, [LIBS="$LIBS -linet"])
+ AC_CHECK_HEADER(net/errno.h, [AC_DEFINE(HAVE_NET_ERRNO_H)])
+
+ #--------------------------------------------------------------------
+ # Check for the existence of the -lsocket and -lnsl libraries.
+ # The order here is important, so that they end up in the right
+ # order in the command line generated by make. Here are some
+ # special considerations:
+ # 1. Use "connect" and "accept" to check for -lsocket, and
+ # "gethostbyname" to check for -lnsl.
+ # 2. Use each function name only once: can't redo a check because
+ # autoconf caches the results of the last check and won't redo it.
+ # 3. Use -lnsl and -lsocket only if they supply procedures that
+ # aren't already present in the normal libraries. This is because
+ # IRIX 5.2 has libraries, but they aren't needed and they're
+ # bogus: they goof up name resolution if used.
+ # 4. On some SVR4 systems, can't use -lsocket without -lnsl too.
+ # To get around this problem, check for both libraries together
+ # if -lsocket doesn't work by itself.
+ #--------------------------------------------------------------------
+
+ tcl_checkBoth=0
+ AC_CHECK_FUNC(connect, tcl_checkSocket=0, tcl_checkSocket=1)
+ if test "$tcl_checkSocket" = 1; then
+ AC_CHECK_FUNC(setsockopt, , [AC_CHECK_LIB(socket, setsockopt,
+ LIBS="$LIBS -lsocket", tcl_checkBoth=1)])
+ fi
+ if test "$tcl_checkBoth" = 1; then
+ tk_oldLibs=$LIBS
+ LIBS="$LIBS -lsocket -lnsl"
+ AC_CHECK_FUNC(accept, tcl_checkNsl=0, [LIBS=$tk_oldLibs])
+ fi
+ AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl, gethostbyname,
+ [LIBS="$LIBS -lnsl"])])
+
+ # Don't perform the eval of the libraries here because DL_LIBS
+ # won't be set until we call SC_CONFIG_CFLAGS
+
+ TCL_LIBS='${DL_LIBS} ${LIBS} ${MATH_LIBS}'
+ AC_SUBST(TCL_LIBS)
+ AC_SUBST(MATH_LIBS)
+])
+
+#--------------------------------------------------------------------
+# SC_TCL_EARLY_FLAGS
+#
+# Check for what flags are needed to be passed so the correct OS
+# features are available.
+#
+# Arguments:
+# None
+#
+# Results:
+#
+# Might define the following vars:
+# _ISOC99_SOURCE
+# _LARGEFILE64_SOURCE
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_EARLY_FLAG],[
+ AC_CACHE_VAL([tcl_cv_flag_]translit($1,[A-Z],[a-z]),
+ AC_TRY_COMPILE([$2], $3, [tcl_cv_flag_]translit($1,[A-Z],[a-z])=no,
+ AC_TRY_COMPILE([[#define ]$1[ 1
+]$2], $3,
+ [tcl_cv_flag_]translit($1,[A-Z],[a-z])=yes,
+ [tcl_cv_flag_]translit($1,[A-Z],[a-z])=no)))
+ if test ["x${tcl_cv_flag_]translit($1,[A-Z],[a-z])[}" = "xyes"] ; then
+ AC_DEFINE($1)
+ tcl_flags="$tcl_flags $1"
+ fi])
+
+AC_DEFUN([SC_TCL_EARLY_FLAGS],[
+ AC_MSG_CHECKING([for required early compiler flags])
+ tcl_flags=""
+ SC_TCL_EARLY_FLAG(_ISOC99_SOURCE,[#include <stdlib.h>],
+ [char *p = (char *)strtoll; char *q = (char *)strtoull;])
+ SC_TCL_EARLY_FLAG(_LARGEFILE64_SOURCE,[#include <sys/stat.h>],
+ [struct stat64 buf; int i = stat64("/", &buf);])
+ if test "x${tcl_flags}" = "x" ; then
+ AC_MSG_RESULT(none)
+ else
+ AC_MSG_RESULT(${tcl_flags})
+ fi])
+
+#--------------------------------------------------------------------
+# SC_TCL_64BIT_FLAGS
+#
+# Check for what is defined in the way of 64-bit features.
+#
+# Arguments:
+# None
+#
+# Results:
+#
+# Might define the following vars:
+# TCL_WIDE_INT_IS_LONG
+# TCL_WIDE_INT_TYPE
+# HAVE_STRUCT_DIRENT64
+# HAVE_STRUCT_STAT64
+# HAVE_TYPE_OFF64_T
+#
+#--------------------------------------------------------------------
+
+AC_DEFUN([SC_TCL_64BIT_FLAGS], [
+ AC_MSG_CHECKING([for 64-bit integer type])
+ AC_CACHE_VAL(tcl_cv_type_64bit,[
+ tcl_cv_type_64bit=none
+ # See if the compiler knows natively about __int64
+ AC_TRY_COMPILE(,[__int64 value = (__int64) 0;],
+ tcl_type_64bit=__int64, tcl_type_64bit="long long")
+ # See if we should use long anyway Note that we substitute in the
+ # type that is our current guess for a 64-bit type inside this check
+ # program, so it should be modified only carefully...
+ AC_TRY_RUN([#include <unistd.h>
+ int main() {exit(!(sizeof(]${tcl_type_64bit}[) > sizeof(long)));}
+ ], tcl_cv_type_64bit=${tcl_type_64bit},:,:)])
+ if test "${tcl_cv_type_64bit}" = none ; then
+ AC_DEFINE(TCL_WIDE_INT_IS_LONG)
+ AC_MSG_RESULT(using long)
+ else
+ AC_DEFINE_UNQUOTED(TCL_WIDE_INT_TYPE,${tcl_cv_type_64bit})
+ AC_MSG_RESULT(${tcl_cv_type_64bit})
+
+ # Now check for auxiliary declarations
+ AC_MSG_CHECKING([for struct dirent64])
+ AC_CACHE_VAL(tcl_cv_struct_dirent64,[
+ AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/dirent.h>],[struct dirent64 p;],
+ tcl_cv_struct_dirent64=yes,tcl_cv_struct_dirent64=no)])
+ if test "x${tcl_cv_struct_dirent64}" = "xyes" ; then
+ AC_DEFINE(HAVE_STRUCT_DIRENT64)
+ fi
+ AC_MSG_RESULT(${tcl_cv_struct_dirent64})
+
+ AC_MSG_CHECKING([for struct stat64])
+ AC_CACHE_VAL(tcl_cv_struct_stat64,[
+ AC_TRY_COMPILE([#include <sys/stat.h>],[struct stat64 p;
+],
+ tcl_cv_struct_stat64=yes,tcl_cv_struct_stat64=no)])
+ if test "x${tcl_cv_struct_stat64}" = "xyes" ; then
+ AC_DEFINE(HAVE_STRUCT_STAT64)
+ fi
+ AC_MSG_RESULT(${tcl_cv_struct_stat64})
+
+ AC_MSG_CHECKING([for off64_t])
+ AC_CACHE_VAL(tcl_cv_type_off64_t,[
+ AC_TRY_COMPILE([#include <sys/types.h>],[off64_t offset;
+],
+ tcl_cv_type_off64_t=yes,tcl_cv_type_off64_t=no)])
+ if test "x${tcl_cv_type_off64_t}" = "xyes" ; then
+ AC_DEFINE(HAVE_TYPE_OFF64_T)
+ fi
+ AC_MSG_RESULT(${tcl_cv_type_off64_t})
+ fi])
insight-6.8-warnings.patch:
--- NEW FILE insight-6.8-warnings.patch ---
diff -Naur insight-6.8.orig/gdb/cli/cli-cmds.c insight-6.8.new/gdb/cli/cli-cmds.c
--- insight-6.8.orig/gdb/cli/cli-cmds.c 2008-01-01 23:53:14.000000000 +0100
+++ insight-6.8.new/gdb/cli/cli-cmds.c 2008-08-14 21:42:39.000000000 +0200
@@ -320,7 +320,8 @@
{
if (args)
error (_("The \"pwd\" command does not take an argument: %s"), args);
- getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
+ /* Unused result. */
+ 1 && getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
if (strcmp (gdb_dirbuf, current_directory) != 0)
printf_unfiltered (_("Working directory %s\n (canonically %s).\n"),
diff -Naur insight-6.8.orig/gdb/doublest.c insight-6.8.new/gdb/doublest.c
--- insight-6.8.orig/gdb/doublest.c 2008-01-03 12:39:35.000000000 +0100
+++ insight-6.8.new/gdb/doublest.c 2008-08-14 21:41:32.000000000 +0200
@@ -92,15 +92,10 @@
{
result |= (unsigned long)*(data + cur_byte) << cur_bitshift;
cur_bitshift += FLOATFORMAT_CHAR_BIT;
- switch (order)
- {
- case floatformat_little:
- ++cur_byte;
- break;
- case floatformat_big:
- --cur_byte;
- break;
- }
+ if (order == floatformat_little)
+ ++cur_byte;
+ else
+ --cur_byte;
}
if (len < sizeof(result) * FLOATFORMAT_CHAR_BIT)
/* Mask out bits which are not part of the field */
diff -Naur insight-6.8.orig/gdb/dwarf2expr.c insight-6.8.new/gdb/dwarf2expr.c
--- insight-6.8.orig/gdb/dwarf2expr.c 2008-01-01 23:53:09.000000000 +0100
+++ insight-6.8.new/gdb/dwarf2expr.c 2008-08-14 21:38:31.000000000 +0200
@@ -595,6 +595,8 @@
op_ptr = read_uleb128 (op_ptr, op_end, ®);
result += reg;
break;
+ default:
+ break;
}
break;
diff -Naur insight-6.8.orig/gdb/dwarf2read.c insight-6.8.new/gdb/dwarf2read.c
--- insight-6.8.orig/gdb/dwarf2read.c 2008-03-10 15:18:10.000000000 +0100
+++ insight-6.8.new/gdb/dwarf2read.c 2008-08-14 21:37:07.000000000 +0200
@@ -9641,6 +9641,7 @@
for (;;)
{
enum dwarf_macinfo_record_type macinfo_type;
+ int tmp;
/* Do we at least have room for a macinfo type byte? */
if (mac_ptr >= mac_end)
@@ -9652,13 +9653,16 @@
macinfo_type = read_1_byte (abfd, mac_ptr);
mac_ptr++;
+ /* Check for a zero macinfo type which indicates the end of the macro
+ information. We do this as the compiler may warn us if we
+ try and look for 0 in the switch below because 0 is not
+ an enumerated value. */
+ tmp = (int)macinfo_type;
+ if (tmp == 0)
+ return;
+
switch (macinfo_type)
{
- /* A zero macinfo type indicates the end of the macro
- information. */
- case 0:
- return;
-
case DW_MACINFO_define:
case DW_MACINFO_undef:
{
diff -Naur insight-6.8.orig/gdb/f-exp.y insight-6.8.new/gdb/f-exp.y
--- insight-6.8.orig/gdb/f-exp.y 2008-01-01 23:53:09.000000000 +0100
+++ insight-6.8.new/gdb/f-exp.y 2008-08-14 21:26:51.000000000 +0200
@@ -567,6 +567,8 @@
case tp_function:
follow_type = lookup_function_type (follow_type);
break;
+ default:
+ break;
}
$$ = follow_type;
}
diff -Naur insight-6.8.orig/gdb/gdb-events.c insight-6.8.new/gdb/gdb-events.c
--- insight-6.8.orig/gdb/gdb-events.c 2008-01-01 23:53:09.000000000 +0100
+++ insight-6.8.new/gdb/gdb-events.c 2008-08-14 21:33:42.000000000 +0200
@@ -319,6 +319,8 @@
case architecture_changed:
vector->architecture_changed ();
break;
+ default:
+ break;
}
delivering_events = event->next;
xfree (event);
diff -Naur insight-6.8.orig/gdb/gdbserver/gdbreplay.c insight-6.8.new/gdb/gdbserver/gdbreplay.c
--- insight-6.8.orig/gdb/gdbserver/gdbreplay.c 2008-01-01 23:53:14.000000000 +0100
+++ insight-6.8.new/gdb/gdbserver/gdbreplay.c 2008-08-14 21:51:32.000000000 +0200
@@ -356,7 +356,12 @@
{
break;
}
- read (remote_desc, &fromgdb, 1);
+ if (read (remote_desc, &fromgdb, 1) != 1)
+ {
+ /* Error gets reported below. */
+ fromlog = 0;
+ break;
+ }
}
while (fromlog == fromgdb);
if (fromlog != EOL)
@@ -383,7 +388,11 @@
while ((fromlog = logchar (fp)) != EOL)
{
ch = fromlog;
- write (remote_desc, &ch, 1);
+ if (write (remote_desc, &ch, 1) != 1)
+ {
+ sync_error (fp, "Sync error during write of gdb packet", ch, 0);
+ break;
+ }
}
}
diff -Naur insight-6.8.orig/gdb/inflow.c insight-6.8.new/gdb/inflow.c
--- insight-6.8.orig/gdb/inflow.c 2008-01-01 23:53:11.000000000 +0100
+++ insight-6.8.new/gdb/inflow.c 2008-08-14 21:43:55.000000000 +0200
@@ -545,17 +545,20 @@
if (tty != 0)
{
close (0);
- dup (tty);
+ /* Unused result. */
+ 1 && dup (tty);
}
if (tty != 1)
{
close (1);
- dup (tty);
+ /* Unused result. */
+ 1 && dup (tty);
}
if (tty != 2)
{
close (2);
- dup (tty);
+ /* Unused result. */
+ 1 && dup (tty);
}
if (tty > 2)
close (tty);
diff -Naur insight-6.8.orig/gdb/linespec.c insight-6.8.new/gdb/linespec.c
--- insight-6.8.orig/gdb/linespec.c 2008-01-01 23:53:11.000000000 +0100
+++ insight-6.8.new/gdb/linespec.c 2008-08-14 21:31:24.000000000 +0200
@@ -1409,7 +1409,7 @@
find_method (int funfirstline, char ***canonical, char *saved_arg,
char *copy, struct type *t, struct symbol *sym_class)
{
- struct symtabs_and_lines values;
+ struct symtabs_and_lines values = {0};
struct symbol *sym = NULL;
int i1; /* Counter for the symbol array. */
struct symbol **sym_arr = alloca (total_number_of_methods (t)
diff -Naur insight-6.8.orig/gdb/linux-nat.c insight-6.8.new/gdb/linux-nat.c
--- insight-6.8.orig/gdb/linux-nat.c 2008-01-29 23:47:20.000000000 +0100
+++ insight-6.8.new/gdb/linux-nat.c 2008-08-14 21:44:39.000000000 +0200
@@ -2876,7 +2876,8 @@
sprintf (fname1, "/proc/%lld/cmdline", pid);
if ((procfile = fopen (fname1, "r")) != NULL)
{
- fgets (buffer, sizeof (buffer), procfile);
+ /* Unused result. */
+ 1 && fgets (buffer, sizeof (buffer), procfile);
printf_filtered ("cmdline = '%s'\n", buffer);
fclose (procfile);
}
diff -Naur insight-6.8.orig/gdb/main.c insight-6.8.new/gdb/main.c
--- insight-6.8.orig/gdb/main.c 2008-01-05 17:49:53.000000000 +0100
+++ insight-6.8.new/gdb/main.c 2008-08-14 21:45:18.000000000 +0200
@@ -188,7 +188,8 @@
line[0] = '\0'; /* Terminate saved (now empty) cmd line */
instream = stdin;
- getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
+ /* Unused result. */
+ 1 && getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
current_directory = gdb_dirbuf;
gdb_stdout = stdio_fileopen (stdout);
diff -Naur insight-6.8.orig/gdb/mi/mi-cmd-env.c insight-6.8.new/gdb/mi/mi-cmd-env.c
--- insight-6.8.orig/gdb/mi/mi-cmd-env.c 2008-01-01 23:53:14.000000000 +0100
+++ insight-6.8.new/gdb/mi/mi-cmd-env.c 2008-08-14 21:46:06.000000000 +0200
@@ -78,7 +78,8 @@
/* Otherwise the mi level is 2 or higher. */
- getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
+ /* Unused result. */
+ 1 && getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
ui_out_field_string (uiout, "cwd", gdb_dirbuf);
return MI_CMD_DONE;
diff -Naur insight-6.8.orig/gdb/s390-tdep.c insight-6.8.new/gdb/s390-tdep.c
--- insight-6.8.orig/gdb/s390-tdep.c 2008-01-31 16:43:32.000000000 +0100
+++ insight-6.8.new/gdb/s390-tdep.c 2008-08-14 21:25:43.000000000 +0200
@@ -2218,6 +2218,9 @@
case RETURN_VALUE_STRUCT_CONVENTION:
error (_("Cannot set function return value."));
break;
+
+ default:
+ break;
}
}
else if (out)
@@ -2251,6 +2254,9 @@
case RETURN_VALUE_STRUCT_CONVENTION:
error (_("Function return value unknown."));
break;
+
+ default:
+ break;
}
}
diff -Naur insight-6.8.orig/gdb/source.c insight-6.8.new/gdb/source.c
--- insight-6.8.orig/gdb/source.c 2008-02-08 23:20:48.000000000 +0100
+++ insight-6.8.new/gdb/source.c 2008-08-14 21:28:28.000000000 +0200
@@ -170,7 +170,7 @@
void
set_default_source_symtab_and_line (void)
{
- struct symtab_and_line cursal;
+ struct symtab_and_line cursal = {0};
if (!have_full_symbols () && !have_partial_symbols ())
error (_("No symbol table is loaded. Use the \"file\" command."));
@@ -1439,7 +1439,7 @@
static void
line_info (char *arg, int from_tty)
{
- struct symtabs_and_lines sals;
+ struct symtabs_and_lines sals = {0};
struct symtab_and_line sal;
CORE_ADDR start_pc, end_pc;
int i;
diff -Naur insight-6.8.orig/gdb/stabsread.c insight-6.8.new/gdb/stabsread.c
--- insight-6.8.orig/gdb/stabsread.c 2008-01-01 23:53:13.000000000 +0100
+++ insight-6.8.new/gdb/stabsread.c 2008-08-14 21:37:51.000000000 +0200
@@ -1828,7 +1828,8 @@
struct type *domain = read_type (pp, objfile);
struct type *return_type;
struct field *args;
- int nargs, varargs;
+ int nargs = 0;
+ int varargs = 0;
if (**pp != ',')
/* Invalid member type data format. */
diff -Naur insight-6.8.orig/gdb/target.c insight-6.8.new/gdb/target.c
--- insight-6.8.orig/gdb/target.c 2008-01-25 01:09:49.000000000 +0100
+++ insight-6.8.new/gdb/target.c 2008-08-14 21:33:14.000000000 +0200
@@ -1045,6 +1045,9 @@
case MEM_NONE:
return -1;
+
+ default:
+ break;
}
if (region->attrib.cache)
diff -Naur insight-6.8.orig/gdb/top.c insight-6.8.new/gdb/top.c
--- insight-6.8.orig/gdb/top.c 2008-01-01 23:53:13.000000000 +0100
+++ insight-6.8.new/gdb/top.c 2008-08-14 21:46:43.000000000 +0200
@@ -1628,7 +1628,8 @@
/* Run the init function of each source file */
- getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
+ /* Unused result. */
+ 1 && getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
current_directory = gdb_dirbuf;
#ifdef __MSDOS__
diff -Naur insight-6.8.orig/gdb/ui-file.c insight-6.8.new/gdb/ui-file.c
--- insight-6.8.orig/gdb/ui-file.c 2008-01-01 23:53:13.000000000 +0100
+++ insight-6.8.new/gdb/ui-file.c 2008-08-14 21:48:01.000000000 +0200
@@ -481,7 +481,8 @@
if (stdio->magic != &stdio_file_magic)
internal_error (__FILE__, __LINE__,
_("stdio_file_write: bad magic number"));
- fwrite (buf, length_buf, 1, stdio->file);
+ /* Unused result. */
+ 1 && fwrite (buf, length_buf, 1, stdio->file);
}
static void
diff -Naur insight-6.8.orig/gdb/utils.c insight-6.8.new/gdb/utils.c
--- insight-6.8.orig/gdb/utils.c 2008-01-01 23:53:13.000000000 +0100
+++ insight-6.8.new/gdb/utils.c 2008-08-14 21:47:36.000000000 +0200
@@ -704,7 +704,8 @@
abort (); /* NOTE: GDB has only three calls to abort(). */
default:
dejavu = 3;
- write (STDERR_FILENO, msg, sizeof (msg));
+ /* Unused result. */
+ 1 && write (STDERR_FILENO, msg, sizeof (msg));
exit (1);
}
}
diff -Naur insight-6.8.orig/gdb/varobj.c insight-6.8.new/gdb/varobj.c
--- insight-6.8.orig/gdb/varobj.c 2008-02-04 08:49:04.000000000 +0100
+++ insight-6.8.new/gdb/varobj.c 2008-08-14 21:40:16.000000000 +0200
@@ -319,8 +319,7 @@
/* Array of known source language routines. */
static struct language_specific languages[vlang_end] = {
/* Unknown (try treating as C */
- {
- vlang_unknown,
+ {vlang_unknown,
c_number_of_children,
c_name_of_variable,
c_name_of_child,
@@ -331,8 +330,7 @@
c_value_of_variable}
,
/* C */
- {
- vlang_c,
+ {vlang_c,
c_number_of_children,
c_name_of_variable,
c_name_of_child,
@@ -343,8 +341,7 @@
c_value_of_variable}
,
/* C++ */
- {
- vlang_cplus,
+ {vlang_cplus,
cplus_number_of_children,
cplus_name_of_variable,
cplus_name_of_child,
@@ -355,8 +352,7 @@
cplus_value_of_variable}
,
/* Java */
- {
- vlang_java,
+ {vlang_java,
java_number_of_children,
java_name_of_variable,
java_name_of_child,
--- NEW FILE insight.1 ---
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
.TH INSIGHT "1" "December 2007" "insight 6.7.1" "User Commands"
.SH NAME
insight \- GDB/Insight graphical debugger
.SH DESCRIPTION
This is the GNU debugger. Usage:
.IP
insight [options] [executable\-file [core\-file or process\-id]]
insight [options] \fB\-\-args\fR executable\-file [inferior\-arguments ...]
.SH OPTIONS
.TP
\fB\-\-args\fR
Arguments after executable\-file are passed to inferior
.TP
\fB\-b\fR BAUDRATE
Set serial port baud rate used for remote debugging.
.TP
\fB\-\-batch\fR
Exit after processing options.
.TP
\fB\-\-batch\-silent\fR
As for \fB\-\-batch\fR, but suppress all insight stdout output.
.TP
\fB\-\-return\-child\-result\fR
INSIGHT exit code will be the child's exit code.
.TP
\fB\-\-cd\fR=\fIDIR\fR
Change current directory to DIR.
.HP
\fB\-\-command\fR=\fIFILE\fR, \fB\-x\fR Execute INSIGHT commands from FILE.
.TP
\fB\-\-eval\-command\fR=\fICOMMAND\fR, \fB\-ex\fR
Execute a single INSIGHT command.
May be used multiple times and in conjunction
with \fB\-\-command\fR.
.TP
\fB\-\-core\fR=\fICOREFILE\fR
Analyze the core dump COREFILE.
.TP
\fB\-\-pid\fR=\fIPID\fR
Attach to running process PID.
.TP
\fB\-\-dbx\fR
DBX compatibility mode.
.TP
\fB\-\-directory\fR=\fIDIR\fR
Search for source files in DIR.
.TP
\fB\-\-epoch\fR
Output information used by epoch emacs\-GDB interface.
.TP
\fB\-\-exec\fR=\fIEXECFILE\fR
Use EXECFILE as the executable.
.TP
\fB\-\-fullname\fR
Output information used by emacs\-GDB interface.
.TP
\fB\-\-help\fR
Print this message.
.TP
\fB\-\-interpreter\fR=\fIINTERP\fR
Select a specific interpreter / user interface
.TP
\fB\-l\fR TIMEOUT
Set timeout in seconds for remote debugging.
.TP
\fB\-\-nw\fR
Do not use a window interface.
.TP
\fB\-\-nx\fR
Do not read .gdbinit file.
.TP
\fB\-\-quiet\fR
Do not print version number on startup.
.TP
\fB\-\-readnow\fR
Fully read symbol files on first access.
.TP
\fB\-\-se\fR=\fIFILE\fR
Use FILE as symbol file and executable file.
.TP
\fB\-\-symbols\fR=\fISYMFILE\fR
Read symbols from SYMFILE.
.TP
\fB\-\-tty\fR=\fITTY\fR
Use TTY for input/output by the program being debugged.
.TP
\fB\-\-tui\fR
Use a terminal user interface.
.TP
\fB\-\-version\fR
Print version information and then exit.
.TP
\fB\-w\fR
Use a window interface.
.TP
\fB\-\-write\fR
Set writing into executable and core files.
.TP
\fB\-\-xdb\fR
XDB compatibility mode.
.PP
For more information, type "help" from within GDB, or consult the
GDB manual (available as on\-line info or a printed manual).
.SH "REPORTING BUGS"
Report bugs to "bug\-gdb at gnu.org".
.SH COPYRIGHT
Copyright \(co 2007 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
.br
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law. Type "show copying"
and "show warranty" for details.
This GDB was configured as "i386-linux-gnu".
.SH "SEE ALSO"
The full documentation for
.B gdb
is maintained as a Texinfo manual. If the
.B info
and
.B gdb
programs are properly installed at your site, the command
.IP
.B info gdb
.PP
should give you access to the complete manual.
--- NEW FILE insight.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Insight
GenericName=Insight Debugger
Comment=GDB Debugger GUI
Exec=insight
Icon=insight
Terminal=false
Type=Application
Categories=Application;Development;
--- NEW FILE insight.spec ---
Name: insight
Version: 6.8
Release: 4%{?dist}
Summary: Graphical debugger based on GDB
License: GPLv3+
Group: Development/Debuggers
Url: http://sources.redhat.com/insight/
Source0: ftp://sourceware.org/pub/insight/releases/insight-%{version}.tar.bz2
Source1: insight.desktop
Source2: insight.1
Patch1: insight-6.8-warnings.patch
Patch2: insight-6.8-destdir.patch
Patch3: insight-6.8-derefbug.patch
Patch4: insight-6.8-gcc43.patch
Patch5: insight-6.8-ia64bound.patch
Patch6: insight-6.8-itcl33.patch
Patch7: insight-6.8-syspackages.patch
Patch8: insight-6.8-relocate.patch
Patch9: insight-6.8-readline-system.patch
Patch10: insight-6.8-tclm4.patch
Patch11: insight-6.8-lib64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: iwidgets
BuildRequires: tcl-devel
BuildRequires: tk-devel
BuildRequires: itcl-devel >= 3.3
BuildRequires: itk-devel >= 3.3
BuildRequires: iwidgets
BuildRequires: ncurses-devel
BuildRequires: readline-devel
BuildRequires: expat-devel
BuildRequires: gif2png
BuildRequires: desktop-file-utils
BuildRequires: automake
BuildRequires: autoconf
%description
Insight is a tight graphical user interface to GDB written in Tcl/Tk.
It provides a comprehensive interface that enables users to harness
most of GDB's power. It's also probably the only up-to-date UI for
GDB version 6.x.
#-------------------------------------------------------------------------------
%prep
#-------------------------------------------------------------------------------
%setup -q
%patch1 -p1 -b .warnings
%patch2 -p1 -b .destdir
%patch3 -p1 -b .derefbug
%patch4 -p1 -b .gcc43
%patch5 -p1 -b .ia64bound
%patch6 -p1 -b .itcl33
%patch7 -p1 -b .syspackages
%patch8 -p1 -b .relocate
%patch9 -p1 -b .readline-system
%patch10 -p1 -b .tclm4
%patch11 -p1 -b .lib64
#-------------------------------------------------------------------------------
%build
#-------------------------------------------------------------------------------
rm -rf itcl tcl tk readline
# Patches "syspackages" and "relocate" requires some autotools rebuilds.
for location in gdb/gdbtk/plugins libgui
do (
cd $location
aclocal
automake
autoconf
)
done
# Patch "readline-system" requires autoconf
(
cd gdb
autoconf
)
# Get inclusion paths.
. "%{_libdir}/tclConfig.sh"
. "%{_libdir}/tkConfig.sh"
# Bug in itcl/itk >= 3.3: no way to determine the include path.
# Hack configure here.
export ac_cv_c_itclh="%{_includedir}"
export ac_cv_c_itkh="%{_includedir}"
# We do our best here to have host=target, since this enables native mode,
# thus local unix process debugging. We also try not to
# cross-compile.
# The ix86 processor family is the problem here.
%ifarch %{ix86}
%define test1 "%{_host_cpu}" == "i386" || "%{_host_cpu}" == "i486"
%define test2 "%{_host_cpu}" == "i686" || "%{_host_cpu}" == "pentium3"
%define test3 "%{_host_cpu}" == "pentium4" || "%{_host_cpu}" == "athlon"
%if %{test1} || %{test2} || %{test3}
%define test1 "%{_build_cpu}" == "i386" || "%{_build_cpu}" == "i486"
%define test2 "%{_build_cpu}" == "i686" || "%{_build_cpu}" == "pentium3"
%define test3 "%{_build_cpu}" == "pentium4" || "%{_build_cpu}" == "athlon"
%if %{test1} || %{test2} || %{test3}
%define _build %{_target_platform}
%endif
%define _host %{_target_platform}
%endif
%endif
%configure --enable-gdbtk \
--enable-sim \
--disable-rpath \
--with-separate-debug-dir=/usr/lib/debug \
--with-system-readline \
--with-expat \
--with-tclinclude="${TCL_SRC_DIR}" \
--with-tkinclude="${TK_SRC_DIR}" \
%ifarch ia64
--with-libunwind \
%else
--without-libunwind \
%endif
%{_target_platform}
make %{?_smp_mflags}
#-------------------------------------------------------------------------------
%install
#-------------------------------------------------------------------------------
rm -rf "${RPM_BUILD_ROOT}"
INSTALL="install -p"
make DESTDIR="${RPM_BUILD_ROOT}" INSTALL="${INSTALL}" install
# Removes unnecessary stuff.
(
cd "${RPM_BUILD_ROOT}"
rm -f .%{_bindir}/gdb
rm -f .%{_bindir}/gdbtui
rm -f .%{_bindir}/gdbserver
rm -rf .%{_includedir}
rm -f .%{_libdir}/*.a
rm -f .%{_libdir}/*.la
rm -f .%{_libdir}/*.sh
rm -rf .%{_prefix}/man
rm -rf .%{_datadir}/man
rm -rf .%{_datadir}/info
rm -rf .%{_datadir}/locale
)
# Regenerate the libgui pkgIndex.tcl file.
echo "pkg_mkIndex \"${RPM_BUILD_ROOT}%{_datadir}/insight/gui\"" | tclsh
# Install man file.
${INSTALL} -m 755 -d "${RPM_BUILD_ROOT}%{_mandir}/man1"
${INSTALL} -m 644 -p "%{SOURCE2}" "${RPM_BUILD_ROOT}%{_mandir}/man1/"
# Create the menu entry.
${INSTALL} -m 755 -d "${RPM_BUILD_ROOT}%{_datadir}/applications"
desktop-file-install \
--vendor "fedora" \
--dir "${RPM_BUILD_ROOT}%{_datadir}/applications" \
"%{SOURCE1}"
# Install icon.
${INSTALL} -m 755 -d "${RPM_BUILD_ROOT}%{_datadir}/pixmaps"
gif2png -f -O < "gdb/gdbtk/library/images/gdbtk_icon.gif" \
> "${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png"
#-------------------------------------------------------------------------------
%clean
#-------------------------------------------------------------------------------
rm -rf "${RPM_BUILD_ROOT}"
#-------------------------------------------------------------------------------
%files
#-------------------------------------------------------------------------------
%defattr(-, root, root, -)
%doc gdb/NEWS gdb/gdbtk/README gdb/gdbtk/plugins/HOW-TO include/COPYING3
%{_bindir}/*
%{_datadir}/insight
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%{_mandir}/man*/*
#-------------------------------------------------------------------------------
%changelog
#-------------------------------------------------------------------------------
* Mon Oct 13 2008 Patrick Monnerat <pm at datasphere.ch> 6.8-4
- X-Fedora application category removed.
- Force option -p of install.
* Thu Oct 9 2008 Patrick Monnerat <pm at datasphere.ch> 6.8-3
- Patch "lib64" to enable tcl/tk/itcl/itk searches also in */lib64.
* Wed Oct 8 2008 Patrick Monnerat <pm at datasphere.ch> 6.8-2
- Patch "tclm4" to define tcl/tk autoconf macros in gdbtk/plugins directory.
- Use system readline.
- Force expat use.
* Thu Aug 14 2008 Patrick Monnerat <pm at datasphere.ch> 6.8-1
- Initial package.
- Patch "warnings" to suppress compilation warnings, since these abort rpmbuild.
- Patch "destdir" to properly install files when DESTDIR is defined.
- Patch "derefbug" to fix an address/value confusion bug.
- Patch "gcc43" to satisfy extra checks of gcc compiler version 4.3.
- Patch "ia64bound" to fix an array index out-of-bound bug in IA64
specific code.
- Patch "itcl33" to migrate all code to itcl/itk version 3.3.
- Patch "syspackages" to use system-installed packages tck, tk, itcl, itk and
iwidgets.
- Patch "relocate" to move all datadir/subdir stuff into datadir/insight (incl.
libgui, that ought to be an external package). Non-binary libdir/* is also
moved.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/insight/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 15 Oct 2008 05:55:26 -0000 1.1
+++ .cvsignore 15 Oct 2008 09:46:21 -0000 1.2
@@ -0,0 +1 @@
+insight-6.8.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/insight/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 15 Oct 2008 05:55:26 -0000 1.1
+++ sources 15 Oct 2008 09:46:22 -0000 1.2
@@ -0,0 +1 @@
+b403972b35520399663c7054e8132ca9 insight-6.8.tar.bz2
More information about the fedora-extras-commits
mailing list