From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24570 invoked by alias); 19 Oct 2005 14:46:31 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 24401 invoked by uid 22791); 19 Oct 2005 14:46:26 -0000 Received: from nevyn.them.org (HELO nevyn.them.org) (66.93.172.17) by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Wed, 19 Oct 2005 14:46:26 +0000 Received: from drow by nevyn.them.org with local (Exim 4.54) id 1ESFCx-0002jk-TU; Wed, 19 Oct 2005 10:46:24 -0400 Date: Wed, 19 Oct 2005 14:46:00 -0000 From: Daniel Jacobowitz To: gcc-patches@gcc.gnu.org, gdb-patches@sourceware.org, binutils@sourceware.org Subject: Update gdbtk dependencies to fix --disable-gdbtk Message-ID: <20051019144623.GA10419@nevyn.them.org> Mail-Followup-To: gcc-patches@gcc.gnu.org, gdb-patches@sourceware.org, binutils@sourceware.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.8i X-SW-Source: 2005-10/txt/msg00159.txt.bz2 I accidentally used cvs up -dP on one of my build trees last night, and a whole bunch of my GDB scripts fell down. I had bits designed to fix most of this, but they didn't work well enough. This patch addresses the only bit that completely failed outside of various forgotten --disable-gdbtk options. First of all, with that specified, install-gdb depended on install-libgui but all-gdb did not depend on all-libgui, so install-libgui failed. Secondly, tcl/tk/itcl were still configured and eventually built (by their install rules). This patch makes --disable-gdbtk _really_ disable GDB's dependencies on TCL, TK, itcl, and libgui. Tested in a couple of cross configurations. OK? -- Daniel Jacobowitz CodeSourcery, LLC 2005-10-19 Daniel Jacobowitz * Makefile.def: Remove gdb dependencies for gdbtk. * Makefile.tpl (CONFIGURE_GDB_TK, INSTALL_GDB_TK): New variables. (configure-gdb, install-gdb): New rules. * configure.in: Set CONFIGURE_GDB_TK and INSTALL_GDB_TK. * Makefile.in, configure: Regenerated. Index: src/Makefile.def =================================================================== --- src.orig/Makefile.def 2005-10-18 17:26:20.000000000 -0400 +++ src/Makefile.def 2005-10-19 09:10:31.000000000 -0400 @@ -275,9 +275,6 @@ dependencies = { module=all-fixincludes; dependencies = { module=all-gnattools; on=all-target-libada; }; // Host modules specific to gdb. -dependencies = { module=configure-gdb; on=configure-itcl; }; -dependencies = { module=configure-gdb; on=configure-tcl; }; -dependencies = { module=configure-gdb; on=configure-tk; }; dependencies = { module=configure-gdb; on=configure-sim; }; dependencies = { module=all-gdb; on=all-libiberty; }; dependencies = { module=all-gdb; on=all-opcodes; }; @@ -286,10 +283,6 @@ dependencies = { module=all-gdb; on=all- dependencies = { module=all-gdb; on=all-build-bison; }; dependencies = { module=all-gdb; on=all-build-byacc; }; dependencies = { module=all-gdb; on=all-sim; }; -dependencies = { module=install-gdb; on=install-tcl; }; -dependencies = { module=install-gdb; on=install-tk; }; -dependencies = { module=install-gdb; on=install-itcl; }; -dependencies = { module=install-gdb; on=install-libgui; }; dependencies = { module=configure-libgui; on=configure-tcl; }; dependencies = { module=configure-libgui; on=configure-tk; }; Index: src/Makefile.tpl =================================================================== --- src.orig/Makefile.tpl 2005-10-18 17:26:21.000000000 -0400 +++ src/Makefile.tpl 2005-10-19 09:09:03.000000000 -0400 @@ -1748,8 +1748,12 @@ all-prebootstrap: maybe-all-[+module+][+ ENDFOR host_modules +] @endif gcc-no-bootstrap +CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@ GDB_TK = @GDB_TK@ +INSTALL_GDB_TK = @INSTALL_GDB_TK@ +configure-gdb: $(CONFIGURE_GDB_TK) all-gdb: $(gdbnlmrequirements) $(GDB_TK) +install-gdb: $(INSTALL_GDB_TK) # Serialization dependencies. Host configures don't work well in parallel to # each other, due to contention over config.cache. Target configures and Index: src/configure.in =================================================================== --- src.orig/configure.in 2005-10-18 20:28:14.000000000 -0400 +++ src/configure.in 2005-10-19 09:10:16.000000000 -0400 @@ -1724,6 +1724,8 @@ case "$enable_gdbtk" in fi ;; esac +CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g` +INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g` # Strip out unwanted targets. @@ -2077,7 +2079,9 @@ AC_SUBST(BUILD_PREFIX) AC_SUBST(BUILD_PREFIX_1) AC_SUBST(tooldir) AC_SUBST(build_tooldir) +AC_SUBST(CONFIGURE_GDB_TK) AC_SUBST(GDB_TK) +AC_SUBST(INSTALL_GDB_TK) # Build module lists & subconfigure args. AC_SUBST(build_configargs)