Subject: Building gdb from ro src
To: None <tech-toolchain@netbsd.org>
From: Nick Hudson <skrll@netbsd.org>
List: tech-toolchain
Date: 01/03/2007 15:33:23
--Boundary-00=_Dz8mFYGsSax3OYM
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Looking at 35271 it appears that building gdb from ro src doesn't quite work 
yet. This diff tries to fix that - anyone know why we don't use GDB provided 
files in libgdb atm?

Nick

--Boundary-00=_Dz8mFYGsSax3OYM
Content-Type: text/x-diff;
  charset="us-ascii";
  name="gdb.diffs"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="gdb.diffs"

Index: dist/gdb6/gdb/Makefile.in
===================================================================
RCS file: /cvsroot/src/gnu/dist/gdb6/gdb/Makefile.in,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile.in
--- dist/gdb6/gdb/Makefile.in	25 Nov 2006 16:38:51 -0000	1.2
+++ dist/gdb6/gdb/Makefile.in	3 Jan 2007 15:03:08 -0000
@@ -1612,6 +1612,8 @@ po/$(PACKAGE).pot: force
 
 .SUFFIXES: .y .l
 .y.c: 
+	@echo "NOT REBUILDING $@"
+NetBSD_DISABLED_y_c:
 	$(SHELL) $(YLWRAP) $< y.tab.c $@.tmp -- $(YACC) $(YFLAGS)
 	-sed -e '/extern.*malloc/d' \
 	     -e '/extern.*realloc/d' \
@@ -1624,6 +1626,8 @@ po/$(PACKAGE).pot: force
 	-rm $@.tmp
 	mv $@.new ./$*.c
 .l.c:
+	@echo "NOT REBUILDING $@"
+NetBSD_DISABLED_l_c:
 	if [ "$(FLEX)" ] && $(FLEX) --version >/dev/null 2>&1; then \
 	    $(FLEX) -o$@ $< && \
 	    rm -f $@.new && \
Index: usr.bin/gdb6/gdb/Makefile
===================================================================
RCS file: /cvsroot/src/gnu/usr.bin/gdb6/gdb/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- usr.bin/gdb6/gdb/Makefile	21 Oct 2006 21:05:57 -0000	1.5
+++ usr.bin/gdb6/gdb/Makefile	3 Jan 2007 15:03:49 -0000
@@ -78,8 +78,8 @@ LDADD+=                -lpthread_dbg
 
 .include <bsd.prog.mk>
 
-# Don't run yacc/bison.
-.y.c .y.h:
+# Don't run yacc/bison or lex.
+.y.c .y.h .l.c:
 
 .PATH: ${DIST}/gdb ${DIST}/gdb/mi ${DIST}/gdb/cli ${DIST}/gdb/tui \
     ${DIST}/gdb/signals ${DIST}/gdb/doc ${.CURDIR}/../arch/${MACHINE_ARCH}
Index: usr.bin/gdb6/libgdb/Makefile
===================================================================
RCS file: /cvsroot/src/gnu/usr.bin/gdb6/libgdb/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- usr.bin/gdb6/libgdb/Makefile	1 Jan 2007 13:09:54 -0000	1.6
+++ usr.bin/gdb6/libgdb/Makefile	3 Jan 2007 15:03:49 -0000
@@ -37,9 +37,5 @@ CPPFLAGS.inf-ptrace.c=	-Wno-error
 #
 COPTS+=	-Wno-stack-protector
 
-# ignore yacc-generated files in ${DIST}/gdb
-ada-exp.c: .NOPATH
-c-exp.c: .NOPATH
-m2-exp.c: .NOPATH
-p-exp.c: .NOPATH
-CLEANFILES+= ada-exp.c c-exp.c m2-exp.c p-exp.c
+# Don't run yacc/bison or lex
+.y.c .y.h .l.c:

--Boundary-00=_Dz8mFYGsSax3OYM--