From 0377a422afbedee36dbf205f3681ea2b5ac67b13 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 25 Mar 2011 13:08:19 +0000 Subject: [PATCH] * configure.ac (native_only): Remove. (i[[3456789]]86-*-msdosdjgpp*): Don't disable expect dejagnu send-pr uudecode guile gnuserv on host. (x86_64-*-mingw*): Don't disable expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool on host. (i[[3456789]]86-*-mingw32*): Don't disable expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool on host. (*-*-cygwin*, *-*-netbsd*): Remove host cases. (*-*-kaos*): Don't disable target-examples target-gperf on target. (alpha*-dec-osf*): Don't disable fileutils on target. (sh*-*-pe|mips*-*-pe|*arm-wince-pe): Don't disable target-examples texinfo send-pr expect dejagnu on target. (arm-*-elf* | arm*-*-eabi*, arm*-*-linux-gnueabi): Don't disable target-qthreads on target. (hppa*-hp-hpux11*, hppa*-*-*): Don't disable shellutils on target. (ia64*-*-elf*, ia64*-*-*vms*): Don't disable mmalloc on target. (i[[3456789]]86-w64-mingw*, i[[3456789]]86-*-mingw*, x86_64-*-mingw*): Don't disable expect on target. (*-*-cygwin*): Don't disable target-gperf on target. (powerpc*-*-winnt* | powerpc*-*-pe*): Don't disable make expect gnuserv on target. (powerpcle-*-solaris*): Don't disable make expect gnuserv on target. * configure: Regenerate. --- ChangeLog | 27 +++++++++++++++++++++++++ configure | 56 ++++++++++++++++++++-------------------------------- configure.ac | 56 ++++++++++++++++++++-------------------------------- 3 files changed, 69 insertions(+), 70 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc24f76aef9..681f488136d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +2011-03-25 Joseph Myers + + * configure.ac (native_only): Remove. + (i[[3456789]]86-*-msdosdjgpp*): Don't disable expect dejagnu + send-pr uudecode guile gnuserv on host. + (x86_64-*-mingw*): Don't disable expect dejagnu autoconf automake + send-pr rcs guile perl texinfo libtool on host. + (i[[3456789]]86-*-mingw32*): Don't disable expect dejagnu autoconf + automake send-pr rcs guile perl texinfo libtool on host. + (*-*-cygwin*, *-*-netbsd*): Remove host cases. + (*-*-kaos*): Don't disable target-examples target-gperf on target. + (alpha*-dec-osf*): Don't disable fileutils on target. + (sh*-*-pe|mips*-*-pe|*arm-wince-pe): Don't disable target-examples + texinfo send-pr expect dejagnu on target. + (arm-*-elf* | arm*-*-eabi*, arm*-*-linux-gnueabi): Don't disable + target-qthreads on target. + (hppa*-hp-hpux11*, hppa*-*-*): Don't disable shellutils on target. + (ia64*-*-elf*, ia64*-*-*vms*): Don't disable mmalloc on target. + (i[[3456789]]86-w64-mingw*, i[[3456789]]86-*-mingw*, + x86_64-*-mingw*): Don't disable expect on target. + (*-*-cygwin*): Don't disable target-gperf on target. + (powerpc*-*-winnt* | powerpc*-*-pe*): Don't disable make expect + gnuserv on target. + (powerpcle-*-solaris*): Don't disable make expect gnuserv on + target. + * configure: Regenerate. + 2011-03-25 Joseph Myers * configure.ac (target_tools): Remove target-groff. diff --git a/configure b/configure index c6e26624713..a922c682028 100755 --- a/configure +++ b/configure @@ -2726,8 +2726,7 @@ target_libraries="target-libgcc \ # run only in the target environment # # note: any program that *uses* libraries that are in the "target_libraries" -# list belongs in this list. those programs are also very likely -# candidates for the "native_only" list which follows +# list belongs in this list. # target_tools="target-examples target-gperf target-rda" @@ -2835,17 +2834,12 @@ case ${with_x} in *) echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2 ;; esac -# Some tools are only suitable for building in a "native" situation. -# Remove these if host!=target. -native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff guile perl time ash bash bzip2 prms gnuserv target-gperf" - -# Similarly, some are only suitable for cross toolchains. +# Some are only suitable for cross toolchains. # Remove these if host=target. cross_only="target-libgloss target-newlib target-opcodes" case $is_cross_compiler in no) skipdirs="${skipdirs} ${cross_only}" ;; - yes) skipdirs="${skipdirs} ${native_only}" ;; esac # If both --with-headers and --with-libs are specified, default to @@ -2971,19 +2965,13 @@ unsupported_languages= case "${host}" in i[3456789]86-*-msdosdjgpp*) - noconfigdirs="$noconfigdirs tcl tk expect dejagnu send-pr uudecode guile itcl gnuserv libffi" + noconfigdirs="$noconfigdirs tcl tk itcl libffi" ;; x86_64-*-mingw*) - noconfigdirs="$noconfigdirs expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool newlib" + noconfigdirs="$noconfigdirs newlib" ;; i[3456789]86-*-mingw32*) - noconfigdirs="$noconfigdirs expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool newlib" - ;; - *-*-cygwin*) - noconfigdirs="$noconfigdirs autoconf automake send-pr rcs guile perl" - ;; - *-*-netbsd*) - noconfigdirs="$noconfigdirs rcs" + noconfigdirs="$noconfigdirs newlib" ;; esac @@ -3134,7 +3122,7 @@ case "${target}" in *-*-kaos*) # Remove unsupported stuff on all kaOS configurations. skipdirs="target-libiberty ${libgcj} target-libstdc++-v3" - skipdirs="$skipdirs target-libobjc target-examples target-gperf" + skipdirs="$skipdirs target-libobjc" skipdirs="$skipdirs zlib fastjar target-libjava target-boehm-gc target-zlib" noconfigdirs="$noconfigdirs target-libgloss" ;; @@ -3170,9 +3158,9 @@ case "${target}" in ;; alpha*-dec-osf*) # ld works, but does not support shared libraries. - # newlib is not 64 bit ready. I'm not sure about fileutils. + # newlib is not 64 bit ready. # gas doesn't generate exception information. - noconfigdirs="$noconfigdirs gas ld fileutils target-newlib target-libgloss" + noconfigdirs="$noconfigdirs gas ld target-newlib target-libgloss" ;; alpha*-*-*vms*) noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}" @@ -3193,10 +3181,8 @@ case "${target}" in ;; sh*-*-pe|mips*-*-pe|*arm-wince-pe) noconfigdirs="$noconfigdirs ${libgcj}" - noconfigdirs="$noconfigdirs target-examples" - noconfigdirs="$noconfigdirs target-libiberty texinfo send-pr" + noconfigdirs="$noconfigdirs target-libiberty" noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" - noconfigdirs="$noconfigdirs expect dejagnu" # the C++ libraries don't build on top of CE's C libraries noconfigdirs="$noconfigdirs target-libstdc++-v3" noconfigdirs="$noconfigdirs target-newlib" @@ -3210,11 +3196,11 @@ case "${target}" in libgloss_dir=arm ;; arm-*-elf* | arm*-*-eabi* ) - noconfigdirs="$noconfigdirs target-libffi target-qthreads" + noconfigdirs="$noconfigdirs target-libffi" libgloss_dir=arm ;; arm*-*-linux-gnueabi) - noconfigdirs="$noconfigdirs target-qthreads" + noconfigdirs="$noconfigdirs" case ${with_newlib} in no) noconfigdirs="$noconfigdirs target-newlib target-libgloss" esac @@ -3304,7 +3290,7 @@ case "${target}" in noconfigdirs="$noconfigdirs ${libgcj}" ;; hppa*-hp-hpux11*) - noconfigdirs="$noconfigdirs ld shellutils" + noconfigdirs="$noconfigdirs ld" ;; hppa*-*-pro*) libgloss_dir=pa @@ -3312,14 +3298,14 @@ case "${target}" in hppa*-*-*) # According to Alexandre Oliva , libjava won't # build on HP-UX 10.20. - noconfigdirs="$noconfigdirs ld shellutils ${libgcj}" + noconfigdirs="$noconfigdirs ld ${libgcj}" ;; i960-*-*) noconfigdirs="$noconfigdirs ${libgcj} gdb" ;; ia64*-*-elf*) # No gdb support yet. - noconfigdirs="$noconfigdirs readline mmalloc libgui itcl gdb" + noconfigdirs="$noconfigdirs readline libgui itcl gdb" ;; ia64*-**-hpux*) # No ld support yet. @@ -3327,7 +3313,7 @@ case "${target}" in ;; ia64*-*-*vms*) # No gdb or ld support yet. - noconfigdirs="$noconfigdirs ${libgcj} readline mmalloc libgui itcl gdb ld" + noconfigdirs="$noconfigdirs ${libgcj} readline libgui itcl gdb ld" ;; i[3456789]86-*-coff | i[3456789]86-*-elf) noconfigdirs="$noconfigdirs ${libgcj}" @@ -3353,18 +3339,18 @@ case "${target}" in # 'target-newlib' will appear in skipdirs. ;; i[3456789]86-w64-mingw*) - noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" ;; i[3456789]86-*-mingw*) target_configdirs="$target_configdirs target-winsup" - noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" ;; x86_64-*-mingw*) - noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" ;; *-*-cygwin*) target_configdirs="$target_configdirs target-libtermcap target-winsup" - noconfigdirs="$noconfigdirs target-gperf target-libgloss" + noconfigdirs="$noconfigdirs target-libgloss" # always build newlib if winsup directory is present. if test -d "$srcdir/winsup/cygwin"; then skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` @@ -3435,13 +3421,13 @@ case "${target}" in ;; powerpc*-*-winnt* | powerpc*-*-pe*) target_configdirs="$target_configdirs target-winsup" - noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl gnuserv ${libgcj}" + noconfigdirs="$noconfigdirs gdb tcl tk target-libgloss itcl ${libgcj}" # always build newlib. skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;; # This is temporary until we can link against shared libraries powerpcle-*-solaris*) - noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl gnuserv ${libgcj}" + noconfigdirs="$noconfigdirs gdb sim tcl tk itcl ${libgcj}" libgloss_dir=rs6000 ;; powerpc-*-beos*) diff --git a/configure.ac b/configure.ac index f533edc17b3..bac6486bcc3 100644 --- a/configure.ac +++ b/configure.ac @@ -207,8 +207,7 @@ target_libraries="target-libgcc \ # run only in the target environment # # note: any program that *uses* libraries that are in the "target_libraries" -# list belongs in this list. those programs are also very likely -# candidates for the "native_only" list which follows +# list belongs in this list. # target_tools="target-examples target-gperf target-rda" @@ -296,17 +295,12 @@ case ${with_x} in *) echo "*** bad value \"${with_x}\" for -with-x flag; ignored" 1>&2 ;; esac -# Some tools are only suitable for building in a "native" situation. -# Remove these if host!=target. -native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff guile perl time ash bash bzip2 prms gnuserv target-gperf" - -# Similarly, some are only suitable for cross toolchains. +# Some are only suitable for cross toolchains. # Remove these if host=target. cross_only="target-libgloss target-newlib target-opcodes" case $is_cross_compiler in no) skipdirs="${skipdirs} ${cross_only}" ;; - yes) skipdirs="${skipdirs} ${native_only}" ;; esac # If both --with-headers and --with-libs are specified, default to @@ -427,19 +421,13 @@ unsupported_languages= case "${host}" in i[[3456789]]86-*-msdosdjgpp*) - noconfigdirs="$noconfigdirs tcl tk expect dejagnu send-pr uudecode guile itcl gnuserv libffi" + noconfigdirs="$noconfigdirs tcl tk itcl libffi" ;; x86_64-*-mingw*) - noconfigdirs="$noconfigdirs expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool newlib" + noconfigdirs="$noconfigdirs newlib" ;; i[[3456789]]86-*-mingw32*) - noconfigdirs="$noconfigdirs expect dejagnu autoconf automake send-pr rcs guile perl texinfo libtool newlib" - ;; - *-*-cygwin*) - noconfigdirs="$noconfigdirs autoconf automake send-pr rcs guile perl" - ;; - *-*-netbsd*) - noconfigdirs="$noconfigdirs rcs" + noconfigdirs="$noconfigdirs newlib" ;; esac @@ -580,7 +568,7 @@ case "${target}" in *-*-kaos*) # Remove unsupported stuff on all kaOS configurations. skipdirs="target-libiberty ${libgcj} target-libstdc++-v3" - skipdirs="$skipdirs target-libobjc target-examples target-gperf" + skipdirs="$skipdirs target-libobjc" skipdirs="$skipdirs zlib fastjar target-libjava target-boehm-gc target-zlib" noconfigdirs="$noconfigdirs target-libgloss" ;; @@ -616,9 +604,9 @@ case "${target}" in ;; alpha*-dec-osf*) # ld works, but does not support shared libraries. - # newlib is not 64 bit ready. I'm not sure about fileutils. + # newlib is not 64 bit ready. # gas doesn't generate exception information. - noconfigdirs="$noconfigdirs gas ld fileutils target-newlib target-libgloss" + noconfigdirs="$noconfigdirs gas ld target-newlib target-libgloss" ;; alpha*-*-*vms*) noconfigdirs="$noconfigdirs gdb target-newlib target-libgloss ${libgcj}" @@ -639,10 +627,8 @@ case "${target}" in ;; sh*-*-pe|mips*-*-pe|*arm-wince-pe) noconfigdirs="$noconfigdirs ${libgcj}" - noconfigdirs="$noconfigdirs target-examples" - noconfigdirs="$noconfigdirs target-libiberty texinfo send-pr" + noconfigdirs="$noconfigdirs target-libiberty" noconfigdirs="$noconfigdirs tcl tk itcl libgui sim" - noconfigdirs="$noconfigdirs expect dejagnu" # the C++ libraries don't build on top of CE's C libraries noconfigdirs="$noconfigdirs target-libstdc++-v3" noconfigdirs="$noconfigdirs target-newlib" @@ -656,11 +642,11 @@ case "${target}" in libgloss_dir=arm ;; arm-*-elf* | arm*-*-eabi* ) - noconfigdirs="$noconfigdirs target-libffi target-qthreads" + noconfigdirs="$noconfigdirs target-libffi" libgloss_dir=arm ;; arm*-*-linux-gnueabi) - noconfigdirs="$noconfigdirs target-qthreads" + noconfigdirs="$noconfigdirs" case ${with_newlib} in no) noconfigdirs="$noconfigdirs target-newlib target-libgloss" esac @@ -750,7 +736,7 @@ case "${target}" in noconfigdirs="$noconfigdirs ${libgcj}" ;; hppa*-hp-hpux11*) - noconfigdirs="$noconfigdirs ld shellutils" + noconfigdirs="$noconfigdirs ld" ;; hppa*-*-pro*) libgloss_dir=pa @@ -758,14 +744,14 @@ case "${target}" in hppa*-*-*) # According to Alexandre Oliva , libjava won't # build on HP-UX 10.20. - noconfigdirs="$noconfigdirs ld shellutils ${libgcj}" + noconfigdirs="$noconfigdirs ld ${libgcj}" ;; i960-*-*) noconfigdirs="$noconfigdirs ${libgcj} gdb" ;; ia64*-*-elf*) # No gdb support yet. - noconfigdirs="$noconfigdirs readline mmalloc libgui itcl gdb" + noconfigdirs="$noconfigdirs readline libgui itcl gdb" ;; ia64*-**-hpux*) # No ld support yet. @@ -773,7 +759,7 @@ case "${target}" in ;; ia64*-*-*vms*) # No gdb or ld support yet. - noconfigdirs="$noconfigdirs ${libgcj} readline mmalloc libgui itcl gdb ld" + noconfigdirs="$noconfigdirs ${libgcj} readline libgui itcl gdb ld" ;; i[[3456789]]86-*-coff | i[[3456789]]86-*-elf) noconfigdirs="$noconfigdirs ${libgcj}" @@ -799,18 +785,18 @@ case "${target}" in # 'target-newlib' will appear in skipdirs. ;; i[[3456789]]86-w64-mingw*) - noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" ;; i[[3456789]]86-*-mingw*) target_configdirs="$target_configdirs target-winsup" - noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" ;; x86_64-*-mingw*) - noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}" + noconfigdirs="$noconfigdirs target-libgloss target-newlib ${libgcj}" ;; *-*-cygwin*) target_configdirs="$target_configdirs target-libtermcap target-winsup" - noconfigdirs="$noconfigdirs target-gperf target-libgloss" + noconfigdirs="$noconfigdirs target-libgloss" # always build newlib if winsup directory is present. if test -d "$srcdir/winsup/cygwin"; then skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` @@ -881,13 +867,13 @@ case "${target}" in ;; powerpc*-*-winnt* | powerpc*-*-pe*) target_configdirs="$target_configdirs target-winsup" - noconfigdirs="$noconfigdirs gdb tcl tk make expect target-libgloss itcl gnuserv ${libgcj}" + noconfigdirs="$noconfigdirs gdb tcl tk target-libgloss itcl ${libgcj}" # always build newlib. skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;; # This is temporary until we can link against shared libraries powerpcle-*-solaris*) - noconfigdirs="$noconfigdirs gdb sim make tcl tk expect itcl gnuserv ${libgcj}" + noconfigdirs="$noconfigdirs gdb sim tcl tk itcl ${libgcj}" libgloss_dir=rs6000 ;; powerpc-*-beos*) -- 2.30.2