From patchwork Wed Apr 6 12:07:07 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 90008 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id B11B4B6EFF for ; Wed, 6 Apr 2011 22:07:29 +1000 (EST) Received: (qmail 10334 invoked by alias); 6 Apr 2011 12:07:23 -0000 Received: (qmail 10299 invoked by uid 22791); 6 Apr 2011 12:07:15 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL, BAYES_00, TW_BF, TW_GC, TW_QT, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 06 Apr 2011 12:07:10 +0000 Received: (qmail 17263 invoked from network); 6 Apr 2011 12:07:08 -0000 Received: from unknown (HELO digraph.polyomino.org.uk) (joseph@127.0.0.2) by mail.codesourcery.com with ESMTPA; 6 Apr 2011 12:07:08 -0000 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.72) (envelope-from ) id 1Q7RVr-0003WX-3q; Wed, 06 Apr 2011 12:07:07 +0000 Date: Wed, 6 Apr 2011 12:07:07 +0000 (UTC) From: "Joseph S. Myers" To: gcc-patches@gcc.gnu.org cc: bonzini@gnu.org, dj@redhat.com, neroden@gcc.gnu.org, aoliva@redhat.com, Ralf.Wildenhues@gmx.de Subject: Remove old toplevel subdirectory support Message-ID: MIME-Version: 1.0 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org This patch removes toplevel support for various subdirectories not present in the gcc or src repositories, as agreed in the thread including . Some other directories may in fact also be no longer useful to support building at toplevel, or may be built for host but only useful for build; this patch just does the removals that should be straightforward and noncontroversial. OK to commit? diffstat for the changes with regenerations included (Makefile.in becomes about half a megabyte smaller): Makefile.def | 79 Makefile.in |17587 ----------------------------------------------------------- configure | 10 configure.ac | 10 4 files changed, 9 insertions(+), 17677 deletions(-) 2011-04-06 Joseph Myers * configure.ac (build_tools): Remove build-byacc. (host_libs): Remove mmalloc. (host_tools): Remove byacc make patch prms send-pr ash bash bzip2 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed perl gawk findutils gettext zip. (libgcj): Remove target-qthreads. (target_tools): Remove target-examples target-gperf. (YACC): Don't handle building byacc. * configure: Regenerate. * Makefile.def (ash, autoconf, automake, bash, byacc, bzip2, diff, dosutils, examples, fileutils, find, findutils, gawk, gettext, gnuserv, gperf, gzip, hello, indent, libtool, make, mmalloc, patch, perl, prms, qthreads, rcs, recode, release, sed, send-pr, shellutils, tar, textutils, time, uudecode, wdiff, zip): Don't handle building components. * Makefile.in: Regenerate. Index: configure.ac =================================================================== --- configure.ac (revision 172035) +++ configure.ac (working copy) @@ -128,11 +128,11 @@ build_libs="build-libiberty" # these tools are built for the build environment -build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fixincludes" +build_tools="build-texinfo build-flex build-bison build-m4 build-fixincludes" # these libraries are used by various programs built for the host environment # -host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv" +host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv" # these tools are built for the host environment # Note, the powerpc-eabi build depends on sim occurring before gdb in order to @@ -140,12 +140,11 @@ # binutils, gas and ld appear in that order because it makes sense to run # "make check" in that particular order. # If --enable-gold is used, "gold" may replace "ld". -host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc cgen sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools" +host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools" # libgcj represents the runtime libraries only used by gcj. libgcj="target-libffi \ target-zlib \ - target-qthreads \ target-libjava" # these libraries are built for the target environment, and are built after @@ -173,7 +172,7 @@ # note: any program that *uses* libraries that are in the "target_libraries" # list belongs in this list. # -target_tools="target-examples target-gperf target-rda" +target_tools="target-rda" ################################################################################ @@ -2956,7 +2955,6 @@ AC_CHECK_PROGS([YACC], ['bison -y' byacc yacc], [$MISSING bison -y]) case " $build_configdirs " in *" bison "*) YACC='$$r/$(BUILD_SUBDIR)/bison/tests/bison -y' ;; - *" byacc "*) YACC='$$r/$(BUILD_SUBDIR)/byacc/byacc' ;; esac AC_CHECK_PROGS([BISON], [bison], [$MISSING bison]) Index: Makefile.def =================================================================== --- Makefile.def (revision 172035) +++ Makefile.def (working copy) @@ -4,7 +4,7 @@ // Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'. // This file was originally written by Nathanael Nerode. // -// Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +// Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 // Free Software Foundation // // This file is free software; you can redistribute it and/or modify @@ -27,39 +27,25 @@ build_modules= { module= libiberty; }; build_modules= { module= bison; }; -build_modules= { module= byacc; }; build_modules= { module= flex; }; build_modules= { module= m4; }; build_modules= { module= texinfo; }; build_modules= { module= fixincludes; }; -host_modules= { module= ash; }; -host_modules= { module= autoconf; }; -host_modules= { module= automake; }; -host_modules= { module= bash; }; host_modules= { module= bfd; lib_path=.libs; bootstrap=true; }; host_modules= { module= opcodes; lib_path=.libs; bootstrap=true; }; host_modules= { module= binutils; bootstrap=true; }; host_modules= { module= bison; no_check_cross= true; }; -host_modules= { module= byacc; no_check_cross= true; }; -host_modules= { module= bzip2; }; host_modules= { module= cgen; }; host_modules= { module= dejagnu; }; -host_modules= { module= diff; }; -host_modules= { module= dosutils; no_check= true; }; host_modules= { module= etc; }; host_modules= { module= fastjar; no_check_cross= true; }; -host_modules= { module= fileutils; }; -host_modules= { module= findutils; }; -host_modules= { module= find; }; host_modules= { module= fixincludes; missing= TAGS; }; host_modules= { module= flex; no_check_cross= true; }; host_modules= { module= gas; bootstrap=true; }; host_modules= { module= gcc; bootstrap=true; extra_make_flags="$(EXTRA_GCC_FLAGS)"; }; -host_modules= { module= gawk; }; -host_modules= { module= gettext; }; host_modules= { module= gmp; lib_path=.libs; bootstrap=true; extra_configure_flags='--disable-shared'; no_install= true; @@ -86,12 +72,8 @@ host_modules= { module= libelf; lib_path=.libs; bootstrap=true; extra_configure_flags='--disable-shared'; no_install= true; }; -host_modules= { module= gnuserv; }; host_modules= { module= gold; bootstrap=true; }; host_modules= { module= gprof; }; -host_modules= { module= gzip; }; -host_modules= { module= hello; }; -host_modules= { module= indent; }; host_modules= { module= intl; bootstrap=true; }; host_modules= { module= tcl; missing=mostlyclean; }; @@ -110,29 +92,11 @@ missing= install-pdf; missing= install-html; missing= install-info; }; -host_modules= { module= libtool; }; host_modules= { module= m4; }; -host_modules= { module= make; }; -host_modules= { module= mmalloc; no_check=true; }; -host_modules= { module= patch; }; -host_modules= { module= perl; }; -host_modules= { module= prms; }; -host_modules= { module= rcs; }; host_modules= { module= readline; }; -host_modules= { module= release; no_install= true; no_check= true; }; -host_modules= { module= recode; }; -host_modules= { module= sed; }; -host_modules= { module= send-pr; }; -host_modules= { module= shellutils; }; host_modules= { module= sid; }; host_modules= { module= sim; }; -host_modules= { module= tar; }; host_modules= { module= texinfo; no_install= true; }; -host_modules= { module= textutils; }; -host_modules= { module= time; }; -host_modules= { module= uudecode; }; -host_modules= { module= wdiff; }; -host_modules= { module= zip; no_check_cross=true; }; host_modules= { module= zlib; no_install=true; no_check=true; bootstrap=true; }; host_modules= { module= gdb; }; host_modules= { module= expect; }; @@ -168,13 +132,10 @@ target_modules = { module= winsup; }; target_modules = { module= libgloss; no_check=true; }; target_modules = { module= libiberty; }; -target_modules = { module= gperf; }; -target_modules = { module= examples; no_check=true; no_install=true; }; target_modules = { module= libffi; }; target_modules = { module= libjava; raw_cxx=true; }; target_modules = { module= zlib; }; target_modules = { module= boehm-gc; }; -target_modules = { module= qthreads; }; target_modules = { module= rda; }; target_modules = { module= libada; }; target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; }; @@ -311,10 +272,8 @@ // Build modules dependencies = { module=all-build-bison; on=all-build-texinfo; }; -dependencies = { module=all-build-byacc; on=all-build-texinfo; }; dependencies = { module=all-build-flex; on=all-build-texinfo; }; dependencies = { module=all-build-flex; on=all-build-bison; }; -dependencies = { module=all-build-flex; on=all-build-byacc; }; dependencies = { module=all-build-flex; on=all-build-m4; }; dependencies = { module=all-build-libiberty; on=all-build-texinfo; }; dependencies = { module=all-build-m4; on=all-build-texinfo; }; @@ -337,7 +296,6 @@ dependencies = { module=all-gcc; on=all-cloog; }; dependencies = { module=all-gcc; on=all-build-texinfo; }; dependencies = { module=all-gcc; on=all-build-bison; }; -dependencies = { module=all-gcc; on=all-build-byacc; }; dependencies = { module=all-gcc; on=all-build-flex; }; dependencies = { module=all-gcc; on=all-build-libiberty; }; dependencies = { module=all-gcc; on=all-build-fixincludes; }; @@ -386,7 +344,6 @@ dependencies = { module=all-gdb; on=all-opcodes; }; dependencies = { module=all-gdb; on=all-readline; }; 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=all-gdb; on=all-libdecnumber; }; dependencies = { module=all-gdb; on=all-libtermcap; }; @@ -411,7 +368,6 @@ dependencies = { module=all-binutils; on=all-bfd; }; dependencies = { module=all-binutils; on=all-build-flex; }; dependencies = { module=all-binutils; on=all-build-bison; }; -dependencies = { module=all-binutils; on=all-build-byacc; }; dependencies = { module=all-binutils; on=all-intl; }; // We put install-opcodes before install-binutils because the installed @@ -439,7 +395,6 @@ dependencies = { module=all-ld; on=all-bfd; }; dependencies = { module=all-ld; on=all-opcodes; }; dependencies = { module=all-ld; on=all-build-bison; }; -dependencies = { module=all-ld; on=all-build-byacc; }; dependencies = { module=all-ld; on=all-build-flex; }; dependencies = { module=all-ld; on=all-intl; }; dependencies = { module=install-ld; on=install-gold; }; @@ -449,7 +404,6 @@ dependencies = { module=all-gold; on=all-intl; }; dependencies = { module=all-gold; on=all-bfd; }; dependencies = { module=all-gold; on=all-build-bison; }; -dependencies = { module=all-gold; on=all-build-byacc; }; dependencies = { module=check-gold; on=all-binutils; }; dependencies = { module=check-gold; on=all-gas; }; @@ -503,44 +457,18 @@ dependencies = { module=all-fastjar; on=all-libiberty; }; // Warning, these are not well tested. -dependencies = { module=all-autoconf; on=all-m4; }; -dependencies = { module=all-autoconf; on=all-build-texinfo; }; -dependencies = { module=all-automake; on=all-m4; }; -dependencies = { module=all-automake; on=all-build-texinfo; }; -dependencies = { module=all-automake; on=all-autoconf; }; dependencies = { module=all-bison; on=all-intl; }; dependencies = { module=all-bison; on=all-build-texinfo; }; -dependencies = { module=all-diff; on=all-intl; }; -dependencies = { module=all-diff; on=all-build-texinfo; }; -dependencies = { module=all-fileutils; on=all-intl; }; -dependencies = { module=all-fileutils; on=all-build-texinfo; }; dependencies = { module=all-flex; on=all-build-bison; }; -dependencies = { module=all-flex; on=all-build-byacc; }; dependencies = { module=all-flex; on=all-intl; }; dependencies = { module=all-flex; on=all-m4; }; dependencies = { module=all-flex; on=all-build-texinfo; }; -dependencies = { module=all-gzip; on=all-intl; }; -dependencies = { module=all-gzip; on=all-zlib; }; -dependencies = { module=all-gzip; on=all-build-texinfo; }; -dependencies = { module=all-hello; on=all-intl; }; -dependencies = { module=all-hello; on=all-build-texinfo; }; dependencies = { module=all-m4; on=all-intl; }; dependencies = { module=all-m4; on=all-build-texinfo; }; -dependencies = { module=all-make; on=all-intl; }; -dependencies = { module=all-make; on=all-build-texinfo; }; -dependencies = { module=all-patch; on=all-build-texinfo; }; -dependencies = { module=all-make; on=all-build-texinfo; }; -dependencies = { module=all-prms; on=all-libiberty; }; -dependencies = { module=all-recode; on=all-build-texinfo; }; -dependencies = { module=all-sed; on=all-build-texinfo; }; -dependencies = { module=all-send-pr; on=all-prms; }; -dependencies = { module=all-tar; on=all-build-texinfo; }; -dependencies = { module=all-uudecode; on=all-build-texinfo; }; // Target modules. These can also have dependencies on the language // environment (e.g. on libstdc++). By default target modules depend // on libgcc and newlib/libgloss. -lang_env_dependencies = { module=gperf; cxx=true; }; lang_env_dependencies = { module=libjava; cxx=true; }; lang_env_dependencies = { module=newlib; no_c=true; }; lang_env_dependencies = { module=libgloss; no_c=true; }; @@ -550,7 +478,6 @@ // a dependency on libgcc for native targets to configure. lang_env_dependencies = { module=libiberty; no_c=true; }; -dependencies = { module=configure-target-boehm-gc; on=configure-target-qthreads; }; dependencies = { module=configure-target-boehm-gc; on=all-target-libstdc++-v3; }; dependencies = { module=configure-target-fastjar; on=configure-target-zlib; }; dependencies = { module=all-target-fastjar; on=all-target-zlib; }; @@ -560,12 +487,10 @@ dependencies = { module=all-target-libgo; on=all-target-libffi; }; dependencies = { module=configure-target-libjava; on=configure-target-zlib; }; dependencies = { module=configure-target-libjava; on=configure-target-boehm-gc; }; -dependencies = { module=configure-target-libjava; on=configure-target-qthreads; }; dependencies = { module=configure-target-libjava; on=configure-target-libffi; }; dependencies = { module=all-target-libjava; on=all-fastjar; }; dependencies = { module=all-target-libjava; on=all-target-zlib; }; dependencies = { module=all-target-libjava; on=all-target-boehm-gc; }; -dependencies = { module=all-target-libjava; on=all-target-qthreads; }; dependencies = { module=all-target-libjava; on=all-target-libffi; }; dependencies = { module=configure-target-libobjc; on=configure-target-boehm-gc; }; dependencies = { module=all-target-libobjc; on=all-target-libiberty; }; @@ -578,11 +503,9 @@ dependencies = { module=all-target-libstdc++-v3; on=configure-target-libgomp; }; // Target modules in the 'src' repository. -lang_env_dependencies = { module=examples; }; lang_env_dependencies = { module=libtermcap; }; lang_env_dependencies = { module=rda; }; lang_env_dependencies = { module=winsup; }; -lang_env_dependencies = { module=qthreads; }; dependencies = { module=all-target-libgloss; on=all-target-newlib; }; dependencies = { module=all-target-winsup; on=all-target-libiberty; };