ViewMTN: Diff from [8712443e..] to [347afc66..]

ViewMTN : Branches | Tags | Help | About
Revision [8712443e..]: Info | Browse Files | Download (tar)
The unified diff between revisions [8712443e..] and [347afc66..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "debian/changelog"
#  from [bda23d5f8d3acbec686eddefc4cf9235ecd60501]
#    to [136407aa0bf031bc9d0bd1d7179922f5929dabf9]
#
# patch "patches/13.use-dynamic-readline.patch"
#  from [45e531a224805d03205f730bcb302d2f59361b52]
#    to [181740865750745498c8c8c8b0bc06ffcdef921e]
#
============================================================
--- debian/changelog	bda23d5f8d3acbec686eddefc4cf9235ecd60501
+++ debian/changelog	136407aa0bf031bc9d0bd1d7179922f5929dabf9
@@ -4,6 +4,11 @@ gnat-gdb (6.4+2006-2) unstable; urgency=
     architectures.
   * debian/rules (build-stamp): revive, upstream's configury/make is
     not clever enough to avoid doing things twice.
+  * patches/13.use-dynamic-readline.patch: also remove all references
+    to readline from the top-level Makefile.in, as I noticed that gdb
+    unnecessarily configures and builds it.  Please, upstream: autoconf
+    and automake are EVIL, don't use them.  And don't duplicate source
+    files.

  -- Ludovic Brenta <lbrenta@debian.org>  Fri,  6 Oct 2006 19:40:04 +0200

============================================================
--- patches/13.use-dynamic-readline.patch	45e531a224805d03205f730bcb302d2f59361b52
+++ patches/13.use-dynamic-readline.patch	181740865750745498c8c8c8b0bc06ffcdef921e
@@ -27,3 +27,489 @@ Index: gdb/Makefile.in

  WARN_CFLAGS = @WARN_CFLAGS@
  WERROR_CFLAGS = @WERROR_CFLAGS@
+Index: Makefile.in
+===================================================================
+--- Makefile.in.orig	2006-10-06 17:56:40.000000000 +0200
++++ Makefile.in	2006-10-06 17:58:15.000000000 +0200
+@@ -820,7 +820,6 @@
+     maybe-configure-perl \
+     maybe-configure-prms \
+     maybe-configure-rcs \
+-    maybe-configure-readline \
+     maybe-configure-release \
+     maybe-configure-recode \
+     maybe-configure-sed \
+@@ -948,7 +947,6 @@
+     maybe-all-perl \
+     maybe-all-prms \
+     maybe-all-rcs \
+-    maybe-all-readline \
+     maybe-all-release \
+     maybe-all-recode \
+     maybe-all-sed \
+@@ -1054,7 +1052,6 @@
+     maybe-info-perl \
+     maybe-info-prms \
+     maybe-info-rcs \
+-    maybe-info-readline \
+     maybe-info-release \
+     maybe-info-recode \
+     maybe-info-sed \
+@@ -1156,7 +1153,6 @@
+     maybe-dvi-perl \
+     maybe-dvi-prms \
+     maybe-dvi-rcs \
+-    maybe-dvi-readline \
+     maybe-dvi-release \
+     maybe-dvi-recode \
+     maybe-dvi-sed \
+@@ -1258,7 +1254,6 @@
+     maybe-html-perl \
+     maybe-html-prms \
+     maybe-html-rcs \
+-    maybe-html-readline \
+     maybe-html-release \
+     maybe-html-recode \
+     maybe-html-sed \
+@@ -1360,7 +1355,6 @@
+     maybe-TAGS-perl \
+     maybe-TAGS-prms \
+     maybe-TAGS-rcs \
+-    maybe-TAGS-readline \
+     maybe-TAGS-release \
+     maybe-TAGS-recode \
+     maybe-TAGS-sed \
+@@ -1462,7 +1456,6 @@
+     maybe-install-info-perl \
+     maybe-install-info-prms \
+     maybe-install-info-rcs \
+-    maybe-install-info-readline \
+     maybe-install-info-release \
+     maybe-install-info-recode \
+     maybe-install-info-sed \
+@@ -1564,7 +1557,6 @@
+     maybe-installcheck-perl \
+     maybe-installcheck-prms \
+     maybe-installcheck-rcs \
+-    maybe-installcheck-readline \
+     maybe-installcheck-release \
+     maybe-installcheck-recode \
+     maybe-installcheck-sed \
+@@ -1666,7 +1658,6 @@
+     maybe-mostlyclean-perl \
+     maybe-mostlyclean-prms \
+     maybe-mostlyclean-rcs \
+-    maybe-mostlyclean-readline \
+     maybe-mostlyclean-release \
+     maybe-mostlyclean-recode \
+     maybe-mostlyclean-sed \
+@@ -1768,7 +1759,6 @@
+     maybe-clean-perl \
+     maybe-clean-prms \
+     maybe-clean-rcs \
+-    maybe-clean-readline \
+     maybe-clean-release \
+     maybe-clean-recode \
+     maybe-clean-sed \
+@@ -1870,7 +1860,6 @@
+     maybe-distclean-perl \
+     maybe-distclean-prms \
+     maybe-distclean-rcs \
+-    maybe-distclean-readline \
+     maybe-distclean-release \
+     maybe-distclean-recode \
+     maybe-distclean-sed \
+@@ -1972,7 +1961,6 @@
+     maybe-maintainer-clean-perl \
+     maybe-maintainer-clean-prms \
+     maybe-maintainer-clean-rcs \
+-    maybe-maintainer-clean-readline \
+     maybe-maintainer-clean-release \
+     maybe-maintainer-clean-recode \
+     maybe-maintainer-clean-sed \
+@@ -2130,7 +2118,6 @@
+     maybe-check-perl \
+     maybe-check-prms \
+     maybe-check-rcs \
+-    maybe-check-readline \
+     maybe-check-release \
+     maybe-check-recode \
+     maybe-check-sed \
+@@ -2259,7 +2246,6 @@
+     maybe-install-perl \
+     maybe-install-prms \
+     maybe-install-rcs \
+-    maybe-install-readline \
+     maybe-install-release \
+     maybe-install-recode \
+     maybe-install-sed \
+@@ -2329,7 +2315,6 @@
+     maybe-install-perl \
+     maybe-install-prms \
+     maybe-install-rcs \
+-    maybe-install-readline \
+     maybe-install-release \
+     maybe-install-recode \
+     maybe-install-sed \
+@@ -20452,345 +20437,6 @@
+
+ @endif rcs
+
+-
+-
+-.PHONY: configure-readline maybe-configure-readline
+-maybe-configure-readline:
+-@if readline
+-maybe-configure-readline: configure-readline
+-configure-readline:
+-	@$(unstage)
+-	@test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \
+-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \
+-	r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(HOST_EXPORTS) \
+-	echo Configuring in $(HOST_SUBDIR)/readline; \
+-	cd "$(HOST_SUBDIR)/readline" || exit 1; \
+-	case $(srcdir) in \
+-	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+-	  *) topdir=`echo $(HOST_SUBDIR)/readline/ | \
+-		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+-	esac; \
+-	srcdiroption="--srcdir=$${topdir}/readline"; \
+-	libsrcdir="$$s/readline"; \
+-	$(SHELL) $${libsrcdir}/configure \
+-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
+-	  || exit 1
+-@endif readline
+-
+-
+-
+-
+-
+-.PHONY: all-readline maybe-all-readline
+-maybe-all-readline:
+-@if readline
+-TARGET-readline=all
+-maybe-all-readline: all-readline
+-all-readline: configure-readline
+-	@$(unstage)
+-	@r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(HOST_EXPORTS) \
+-	(cd $(HOST_SUBDIR)/readline && \
+-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-readline))
+-@endif readline
+-
+-
+-
+-
+-.PHONY: check-readline maybe-check-readline
+-maybe-check-readline:
+-@if readline
+-maybe-check-readline: check-readline
+-
+-check-readline:
+-	@$(unstage)
+-	@r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(HOST_EXPORTS) \
+-	(cd $(HOST_SUBDIR)/readline && \
+-	  $(MAKE) $(FLAGS_TO_PASS)  check)
+-
+-@endif readline
+-
+-.PHONY: install-readline maybe-install-readline
+-maybe-install-readline:
+-@if readline
+-maybe-install-readline: install-readline
+-
+-install-readline: installdirs
+-	@$(unstage)
+-	@r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(HOST_EXPORTS) \
+-	(cd $(HOST_SUBDIR)/readline && \
+-	  $(MAKE) $(FLAGS_TO_PASS)  install)
+-
+-@endif readline
+-
+-# Other targets (info, dvi, etc.)
+-
+-.PHONY: maybe-info-readline info-readline
+-maybe-info-readline:
+-@if readline
+-maybe-info-readline: info-readline
+-
+-info-readline: \
+-    configure-readline
+-	@$(unstage)
+-	@[ -f ./readline/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 readline" ; \
+-	(cd $(HOST_SUBDIR)/readline && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          info) \
+-	  || exit 1
+-
+-@endif readline
+-
+-.PHONY: maybe-dvi-readline dvi-readline
+-maybe-dvi-readline:
+-@if readline
+-maybe-dvi-readline: dvi-readline
+-
+-dvi-readline: \
+-    configure-readline
+-	@$(unstage)
+-	@[ -f ./readline/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 readline" ; \
+-	(cd $(HOST_SUBDIR)/readline && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          dvi) \
+-	  || exit 1
+-
+-@endif readline
+-
+-.PHONY: maybe-html-readline html-readline
+-maybe-html-readline:
+-@if readline
+-maybe-html-readline: html-readline
+-
+-html-readline: \
+-    configure-readline
+-	@$(unstage)
+-	@[ -f ./readline/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 readline" ; \
+-	(cd $(HOST_SUBDIR)/readline && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          html) \
+-	  || exit 1
+-
+-@endif readline
+-
+-.PHONY: maybe-TAGS-readline TAGS-readline
+-maybe-TAGS-readline:
+-@if readline
+-maybe-TAGS-readline: TAGS-readline
+-
+-TAGS-readline: \
+-    configure-readline
+-	@$(unstage)
+-	@[ -f ./readline/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 readline" ; \
+-	(cd $(HOST_SUBDIR)/readline && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          TAGS) \
+-	  || exit 1
+-
+-@endif readline
+-
+-.PHONY: maybe-install-info-readline install-info-readline
+-maybe-install-info-readline:
+-@if readline
+-maybe-install-info-readline: install-info-readline
+-
+-install-info-readline: \
+-    configure-readline \
+-    info-readline
+-	@$(unstage)
+-	@[ -f ./readline/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 readline" ; \
+-	(cd $(HOST_SUBDIR)/readline && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          install-info) \
+-	  || exit 1
+-
+-@endif readline
+-
+-.PHONY: maybe-installcheck-readline installcheck-readline
+-maybe-installcheck-readline:
+-@if readline
+-maybe-installcheck-readline: installcheck-readline
+-
+-installcheck-readline: \
+-    configure-readline
+-	@$(unstage)
+-	@[ -f ./readline/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 readline" ; \
+-	(cd $(HOST_SUBDIR)/readline && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          installcheck) \
+-	  || exit 1
+-
+-@endif readline
+-
+-.PHONY: maybe-mostlyclean-readline mostlyclean-readline
+-maybe-mostlyclean-readline:
+-@if readline
+-maybe-mostlyclean-readline: mostlyclean-readline
+-
+-mostlyclean-readline:
+-	@$(unstage)
+-	@[ -f ./readline/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 readline" ; \
+-	(cd $(HOST_SUBDIR)/readline && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          mostlyclean) \
+-	  || exit 1
+-
+-@endif readline
+-
+-.PHONY: maybe-clean-readline clean-readline
+-maybe-clean-readline:
+-@if readline
+-maybe-clean-readline: clean-readline
+-
+-clean-readline:
+-	@$(unstage)
+-	@[ -f ./readline/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 readline" ; \
+-	(cd $(HOST_SUBDIR)/readline && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          clean) \
+-	  || exit 1
+-
+-@endif readline
+-
+-.PHONY: maybe-distclean-readline distclean-readline
+-maybe-distclean-readline:
+-@if readline
+-maybe-distclean-readline: distclean-readline
+-
+-distclean-readline:
+-	@$(unstage)
+-	@[ -f ./readline/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 readline" ; \
+-	(cd $(HOST_SUBDIR)/readline && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          distclean) \
+-	  || exit 1
+-
+-@endif readline
+-
+-.PHONY: maybe-maintainer-clean-readline maintainer-clean-readline
+-maybe-maintainer-clean-readline:
+-@if readline
+-maybe-maintainer-clean-readline: maintainer-clean-readline
+-
+-maintainer-clean-readline:
+-	@$(unstage)
+-	@[ -f ./readline/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 readline" ; \
+-	(cd $(HOST_SUBDIR)/readline && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          maintainer-clean) \
+-	  || exit 1
+-
+-@endif readline
+-
+-
+-
+ .PHONY: configure-release maybe-configure-release
+ maybe-configure-release:
+ @if release
+@@ -36628,7 +36274,6 @@
+ all-gdb: maybe-all-libiberty
+ all-gdb: maybe-all-opcodes
+ all-gdb: maybe-all-bfd
+-all-gdb: maybe-all-readline
+ all-gdb: maybe-all-build-bison
+ all-gdb: maybe-all-build-byacc
+ all-gdb: maybe-all-sim
+@@ -36861,7 +36506,6 @@
+ all-sim: maybe-all-libiberty
+ all-sim: maybe-all-bfd
+ all-sim: maybe-all-opcodes
+-all-sim: maybe-all-readline
+ all-sim: maybe-configure-gdb
+ all-fastjar: maybe-all-zlib
+ all-fastjar: maybe-all-build-texinfo