This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
HEADS UP, reconfiguration needed [+ patch]
- From: dje at google dot com (Doug Evans)
- To: gdb-patches at sourceware dot org
- Date: Wed, 6 Oct 2010 09:53:45 -0700 (PDT)
- Subject: HEADS UP, reconfiguration needed [+ patch]
Hi.
I've checked in this patch:
http://sourceware.org/ml/gdb-patches/2010-10/msg00037.html
This creates new subdirectory data-directory in the build tree.
I thought builds of existing trees would fail after a cvs update,
but they don't. subdir_do is permissive on whether a subdir's
Makefile exists.
I've added the patch below so that builds will now fail until
the tree is reconfigured.
The following is sufficient:
cd $obj/gdb
sh config.status --recheck
sh config.status
If you happened to update your tree after the above patch went in
and before the below patch, please update again.
If y'all want the patch below done differently, please let me know.
I checked this in to minimize the window of potential build problems.
2010-10-06 Doug Evans <dje@google.com>
* Makefile.in (REQUIRED_SUBDIRS): New var.
(subdir_do): Verify required subdir Makefiles exist.
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.1135
diff -u -p -r1.1135 Makefile.in
--- Makefile.in 6 Oct 2010 16:02:43 -0000 1.1135
+++ Makefile.in 6 Oct 2010 16:40:48 -0000
@@ -875,6 +875,12 @@ TSOBS = inflow.o
SUBDIRS = @subdirs@ data-directory
CLEANDIRS = $(SUBDIRS) gnulib
+# List of subdirectories in the build tree that must exist.
+# This is used to force build failures in existing trees when
+# a new directory is added.
+# The format here is for the `case' shell command.
+REQUIRED_SUBDIRS = doc | testsuite | gnulib | data-directory
+
# For now, shortcut the "configure GDB for fewer languages" stuff.
YYFILES = c-exp.c \
cp-name-parser.c \
@@ -1239,6 +1245,13 @@ diststuff: $(DISTSTUFF) $(PACKAGE).pot $
subdir_do: force
@for i in $(DODIRS); do \
+ case $$i in \
+ $(REQUIRED_SUBDIRS)) \
+ if [ ! -f ./$$i/Makefile ] ; then \
+ echo "Missing $$i/Makefile" >&2 ; \
+ exit 1 ; \
+ fi ;; \
+ esac ; \
if [ -f ./$$i/Makefile ] ; then \
if (cd ./$$i; \
$(MAKE) $(FLAGS_TO_PASS) $(DO)) ; then true ; \