diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.def | 3 | ||||
| -rw-r--r-- | Makefile.in | 462 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.ac | 10 |
5 files changed, 489 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2019-06-15 Tom Tromey <tom@tromey.com> + + * configure.ac (host_libs): Add gnulib. + * configure: Rebuild. + * Makefile.def (host_modules, dependencies): Add gnulib. + * Makefile.in: Rebuild. + 2019-06-12 Dimitar Dimitrov <dimitar@dinux.eu> * MAINTAINERS (Write After Approval): Add myself. diff --git a/Makefile.def b/Makefile.def index 29dd6d3..493a31e 100644 --- a/Makefile.def +++ b/Makefile.def @@ -112,6 +112,7 @@ host_modules= { module= texinfo; no_install= true; }; host_modules= { module= zlib; no_install=true; no_check=true; bootstrap=true; extra_configure_flags='@extra_host_zlib_configure_flags@';}; +host_modules= { module= gnulib; }; host_modules= { module= gdb; }; host_modules= { module= expect; }; host_modules= { module= guile; }; @@ -392,11 +393,13 @@ dependencies = { module=all-intl; on=all-libiconv; }; dependencies = { module=configure-gdb; on=all-intl; }; dependencies = { module=configure-gdb; on=configure-sim; }; dependencies = { module=configure-gdb; on=all-bfd; }; +dependencies = { module=configure-gdb; on=all-gnulib; }; // Depend on all-libiconv so that configure checks for iconv // functions will work. dependencies = { module=configure-gdb; on=all-libiconv; }; dependencies = { module=all-gdb; on=all-libiberty; }; dependencies = { module=all-gdb; on=all-libiconv; }; +dependencies = { module=all-gdb; on=all-gnulib; }; dependencies = { module=all-gdb; on=all-opcodes; }; dependencies = { module=all-gdb; on=all-readline; }; dependencies = { module=all-gdb; on=all-build-bison; }; diff --git a/Makefile.in b/Makefile.in index 8486cc3..02cc7a3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1027,6 +1027,7 @@ configure-host: \ maybe-configure-sim \ maybe-configure-texinfo \ maybe-configure-zlib \ + maybe-configure-gnulib \ maybe-configure-gdb \ maybe-configure-expect \ maybe-configure-guile \ @@ -1180,6 +1181,7 @@ all-host: maybe-all-texinfo @if zlib-no-bootstrap all-host: maybe-all-zlib @endif zlib-no-bootstrap +all-host: maybe-all-gnulib all-host: maybe-all-gdb all-host: maybe-all-expect all-host: maybe-all-guile @@ -1285,6 +1287,7 @@ info-host: maybe-info-sid info-host: maybe-info-sim info-host: maybe-info-texinfo info-host: maybe-info-zlib +info-host: maybe-info-gnulib info-host: maybe-info-gdb info-host: maybe-info-expect info-host: maybe-info-guile @@ -1371,6 +1374,7 @@ dvi-host: maybe-dvi-sid dvi-host: maybe-dvi-sim dvi-host: maybe-dvi-texinfo dvi-host: maybe-dvi-zlib +dvi-host: maybe-dvi-gnulib dvi-host: maybe-dvi-gdb dvi-host: maybe-dvi-expect dvi-host: maybe-dvi-guile @@ -1457,6 +1461,7 @@ pdf-host: maybe-pdf-sid pdf-host: maybe-pdf-sim pdf-host: maybe-pdf-texinfo pdf-host: maybe-pdf-zlib +pdf-host: maybe-pdf-gnulib pdf-host: maybe-pdf-gdb pdf-host: maybe-pdf-expect pdf-host: maybe-pdf-guile @@ -1543,6 +1548,7 @@ html-host: maybe-html-sid html-host: maybe-html-sim html-host: maybe-html-texinfo html-host: maybe-html-zlib +html-host: maybe-html-gnulib html-host: maybe-html-gdb html-host: maybe-html-expect html-host: maybe-html-guile @@ -1629,6 +1635,7 @@ TAGS-host: maybe-TAGS-sid TAGS-host: maybe-TAGS-sim TAGS-host: maybe-TAGS-texinfo TAGS-host: maybe-TAGS-zlib +TAGS-host: maybe-TAGS-gnulib TAGS-host: maybe-TAGS-gdb TAGS-host: maybe-TAGS-expect TAGS-host: maybe-TAGS-guile @@ -1715,6 +1722,7 @@ install-info-host: maybe-install-info-sid install-info-host: maybe-install-info-sim install-info-host: maybe-install-info-texinfo install-info-host: maybe-install-info-zlib +install-info-host: maybe-install-info-gnulib install-info-host: maybe-install-info-gdb install-info-host: maybe-install-info-expect install-info-host: maybe-install-info-guile @@ -1801,6 +1809,7 @@ install-pdf-host: maybe-install-pdf-sid install-pdf-host: maybe-install-pdf-sim install-pdf-host: maybe-install-pdf-texinfo install-pdf-host: maybe-install-pdf-zlib +install-pdf-host: maybe-install-pdf-gnulib install-pdf-host: maybe-install-pdf-gdb install-pdf-host: maybe-install-pdf-expect install-pdf-host: maybe-install-pdf-guile @@ -1887,6 +1896,7 @@ install-html-host: maybe-install-html-sid install-html-host: maybe-install-html-sim install-html-host: maybe-install-html-texinfo install-html-host: maybe-install-html-zlib +install-html-host: maybe-install-html-gnulib install-html-host: maybe-install-html-gdb install-html-host: maybe-install-html-expect install-html-host: maybe-install-html-guile @@ -1973,6 +1983,7 @@ installcheck-host: maybe-installcheck-sid installcheck-host: maybe-installcheck-sim installcheck-host: maybe-installcheck-texinfo installcheck-host: maybe-installcheck-zlib +installcheck-host: maybe-installcheck-gnulib installcheck-host: maybe-installcheck-gdb installcheck-host: maybe-installcheck-expect installcheck-host: maybe-installcheck-guile @@ -2059,6 +2070,7 @@ mostlyclean-host: maybe-mostlyclean-sid mostlyclean-host: maybe-mostlyclean-sim mostlyclean-host: maybe-mostlyclean-texinfo mostlyclean-host: maybe-mostlyclean-zlib +mostlyclean-host: maybe-mostlyclean-gnulib mostlyclean-host: maybe-mostlyclean-gdb mostlyclean-host: maybe-mostlyclean-expect mostlyclean-host: maybe-mostlyclean-guile @@ -2145,6 +2157,7 @@ clean-host: maybe-clean-sid clean-host: maybe-clean-sim clean-host: maybe-clean-texinfo clean-host: maybe-clean-zlib +clean-host: maybe-clean-gnulib clean-host: maybe-clean-gdb clean-host: maybe-clean-expect clean-host: maybe-clean-guile @@ -2231,6 +2244,7 @@ distclean-host: maybe-distclean-sid distclean-host: maybe-distclean-sim distclean-host: maybe-distclean-texinfo distclean-host: maybe-distclean-zlib +distclean-host: maybe-distclean-gnulib distclean-host: maybe-distclean-gdb distclean-host: maybe-distclean-expect distclean-host: maybe-distclean-guile @@ -2317,6 +2331,7 @@ maintainer-clean-host: maybe-maintainer-clean-sid maintainer-clean-host: maybe-maintainer-clean-sim maintainer-clean-host: maybe-maintainer-clean-texinfo maintainer-clean-host: maybe-maintainer-clean-zlib +maintainer-clean-host: maybe-maintainer-clean-gnulib maintainer-clean-host: maybe-maintainer-clean-gdb maintainer-clean-host: maybe-maintainer-clean-expect maintainer-clean-host: maybe-maintainer-clean-guile @@ -2459,6 +2474,7 @@ check-host: \ maybe-check-sim \ maybe-check-texinfo \ maybe-check-zlib \ + maybe-check-gnulib \ maybe-check-gdb \ maybe-check-expect \ maybe-check-guile \ @@ -2592,6 +2608,7 @@ install-host-nogcc: \ maybe-install-sim \ maybe-install-texinfo \ maybe-install-zlib \ + maybe-install-gnulib \ maybe-install-gdb \ maybe-install-expect \ maybe-install-guile \ @@ -2642,6 +2659,7 @@ install-host: \ maybe-install-sim \ maybe-install-texinfo \ maybe-install-zlib \ + maybe-install-gnulib \ maybe-install-gdb \ maybe-install-expect \ maybe-install-guile \ @@ -2748,6 +2766,7 @@ install-strip-host: \ maybe-install-strip-sim \ maybe-install-strip-texinfo \ maybe-install-strip-zlib \ + maybe-install-strip-gnulib \ maybe-install-strip-gdb \ maybe-install-strip-expect \ maybe-install-strip-guile \ @@ -33109,6 +33128,447 @@ maintainer-clean-zlib: +.PHONY: configure-gnulib maybe-configure-gnulib +maybe-configure-gnulib: +@if gcc-bootstrap +configure-gnulib: stage_current +@endif gcc-bootstrap +@if gnulib +maybe-configure-gnulib: configure-gnulib +configure-gnulib: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/gnulib/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnulib; \ + $(HOST_EXPORTS) \ + echo Configuring in $(HOST_SUBDIR)/gnulib; \ + cd "$(HOST_SUBDIR)/gnulib" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gnulib/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=gnulib; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + || exit 1 +@endif gnulib + + + + + +.PHONY: all-gnulib maybe-all-gnulib +maybe-all-gnulib: +@if gcc-bootstrap +all-gnulib: stage_current +@endif gcc-bootstrap +@if gnulib +TARGET-gnulib=all +maybe-all-gnulib: all-gnulib +all-gnulib: configure-gnulib + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ + $(TARGET-gnulib)) +@endif gnulib + + + + +.PHONY: check-gnulib maybe-check-gnulib +maybe-check-gnulib: +@if gnulib +maybe-check-gnulib: check-gnulib + +check-gnulib: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(FLAGS_TO_PASS) check) + +@endif gnulib + +.PHONY: install-gnulib maybe-install-gnulib +maybe-install-gnulib: +@if gnulib +maybe-install-gnulib: install-gnulib + +install-gnulib: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(FLAGS_TO_PASS) install) + +@endif gnulib + +.PHONY: install-strip-gnulib maybe-install-strip-gnulib +maybe-install-strip-gnulib: +@if gnulib +maybe-install-strip-gnulib: install-strip-gnulib + +install-strip-gnulib: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(FLAGS_TO_PASS) install-strip) + +@endif gnulib + +# Other targets (info, dvi, pdf, etc.) + +.PHONY: maybe-info-gnulib info-gnulib +maybe-info-gnulib: +@if gnulib +maybe-info-gnulib: info-gnulib + +info-gnulib: \ + configure-gnulib + @: $(MAKE); $(unstage) + @[ -f ./gnulib/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing info in gnulib"; \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + info) \ + || exit 1 + +@endif gnulib + +.PHONY: maybe-dvi-gnulib dvi-gnulib +maybe-dvi-gnulib: +@if gnulib +maybe-dvi-gnulib: dvi-gnulib + +dvi-gnulib: \ + configure-gnulib + @: $(MAKE); $(unstage) + @[ -f ./gnulib/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing dvi in gnulib"; \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + dvi) \ + || exit 1 + +@endif gnulib + +.PHONY: maybe-pdf-gnulib pdf-gnulib +maybe-pdf-gnulib: +@if gnulib +maybe-pdf-gnulib: pdf-gnulib + +pdf-gnulib: \ + configure-gnulib + @: $(MAKE); $(unstage) + @[ -f ./gnulib/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing pdf in gnulib"; \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + pdf) \ + || exit 1 + +@endif gnulib + +.PHONY: maybe-html-gnulib html-gnulib +maybe-html-gnulib: +@if gnulib +maybe-html-gnulib: html-gnulib + +html-gnulib: \ + configure-gnulib + @: $(MAKE); $(unstage) + @[ -f ./gnulib/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing html in gnulib"; \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + html) \ + || exit 1 + +@endif gnulib + +.PHONY: maybe-TAGS-gnulib TAGS-gnulib +maybe-TAGS-gnulib: +@if gnulib +maybe-TAGS-gnulib: TAGS-gnulib + +TAGS-gnulib: \ + configure-gnulib + @: $(MAKE); $(unstage) + @[ -f ./gnulib/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing TAGS in gnulib"; \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + TAGS) \ + || exit 1 + +@endif gnulib + +.PHONY: maybe-install-info-gnulib install-info-gnulib +maybe-install-info-gnulib: +@if gnulib +maybe-install-info-gnulib: install-info-gnulib + +install-info-gnulib: \ + configure-gnulib \ + info-gnulib + @: $(MAKE); $(unstage) + @[ -f ./gnulib/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-info in gnulib"; \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-info) \ + || exit 1 + +@endif gnulib + +.PHONY: maybe-install-pdf-gnulib install-pdf-gnulib +maybe-install-pdf-gnulib: +@if gnulib +maybe-install-pdf-gnulib: install-pdf-gnulib + +install-pdf-gnulib: \ + configure-gnulib \ + pdf-gnulib + @: $(MAKE); $(unstage) + @[ -f ./gnulib/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-pdf in gnulib"; \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-pdf) \ + || exit 1 + +@endif gnulib + +.PHONY: maybe-install-html-gnulib install-html-gnulib +maybe-install-html-gnulib: +@if gnulib +maybe-install-html-gnulib: install-html-gnulib + +install-html-gnulib: \ + configure-gnulib \ + html-gnulib + @: $(MAKE); $(unstage) + @[ -f ./gnulib/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-html in gnulib"; \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-html) \ + || exit 1 + +@endif gnulib + +.PHONY: maybe-installcheck-gnulib installcheck-gnulib +maybe-installcheck-gnulib: +@if gnulib +maybe-installcheck-gnulib: installcheck-gnulib + +installcheck-gnulib: \ + configure-gnulib + @: $(MAKE); $(unstage) + @[ -f ./gnulib/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing installcheck in gnulib"; \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + installcheck) \ + || exit 1 + +@endif gnulib + +.PHONY: maybe-mostlyclean-gnulib mostlyclean-gnulib +maybe-mostlyclean-gnulib: +@if gnulib +maybe-mostlyclean-gnulib: mostlyclean-gnulib + +mostlyclean-gnulib: + @: $(MAKE); $(unstage) + @[ -f ./gnulib/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing mostlyclean in gnulib"; \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + mostlyclean) \ + || exit 1 + +@endif gnulib + +.PHONY: maybe-clean-gnulib clean-gnulib +maybe-clean-gnulib: +@if gnulib +maybe-clean-gnulib: clean-gnulib + +clean-gnulib: + @: $(MAKE); $(unstage) + @[ -f ./gnulib/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing clean in gnulib"; \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + clean) \ + || exit 1 + +@endif gnulib + +.PHONY: maybe-distclean-gnulib distclean-gnulib +maybe-distclean-gnulib: +@if gnulib +maybe-distclean-gnulib: distclean-gnulib + +distclean-gnulib: + @: $(MAKE); $(unstage) + @[ -f ./gnulib/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing distclean in gnulib"; \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + distclean) \ + || exit 1 + +@endif gnulib + +.PHONY: maybe-maintainer-clean-gnulib maintainer-clean-gnulib +maybe-maintainer-clean-gnulib: +@if gnulib +maybe-maintainer-clean-gnulib: maintainer-clean-gnulib + +maintainer-clean-gnulib: + @: $(MAKE); $(unstage) + @[ -f ./gnulib/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing maintainer-clean in gnulib"; \ + (cd $(HOST_SUBDIR)/gnulib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + maintainer-clean) \ + || exit 1 + +@endif gnulib + + + .PHONY: configure-gdb maybe-configure-gdb maybe-configure-gdb: @if gcc-bootstrap @@ -58041,6 +58501,8 @@ all-stagefeedback-intl: maybe-all-stagefeedback-libiconv all-stageautoprofile-intl: maybe-all-stageautoprofile-libiconv all-stageautofeedback-intl: maybe-all-stageautofeedback-libiconv configure-gdb: maybe-configure-sim +configure-gdb: maybe-all-gnulib +all-gdb: maybe-all-gnulib all-gdb: maybe-all-readline all-gdb: maybe-all-build-bison all-gdb: maybe-all-sim @@ -7237,6 +7237,14 @@ esac CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g` INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g` +# gdb depends on gnulib, but as nothing else does, only include it if +# gdb is built. +if echo " ${configdirs} " | grep " gdb " > /dev/null 2>&1 ; then + # The Makefile provides the ordering, so it's enough here to add + # gnulib to the list. + configdirs="${configdirs} gnulib" +fi + # Strip out unwanted targets. # While at that, we remove Makefiles if we were started for recursive diff --git a/configure.ac b/configure.ac index 5f02008..dcc89fb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, # 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, -# 2014, 2015, 2016 Free Software Foundation, Inc. +# 2014, 2015, 2016, 2019 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -2750,6 +2750,14 @@ esac CONFIGURE_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-configure-/g` INSTALL_GDB_TK=`echo ${GDB_TK} | sed s/-all-/-install-/g` +# gdb depends on gnulib, but as nothing else does, only include it if +# gdb is built. +if echo " ${configdirs} " | grep " gdb " > /dev/null 2>&1 ; then + # The Makefile provides the ordering, so it's enough here to add + # gnulib to the list. + configdirs="${configdirs} gnulib" +fi + # Strip out unwanted targets. # While at that, we remove Makefiles if we were started for recursive |