gnu/87872: [PATCH] RELENG_5 gnu contrib make buildworld patch

[Daniel Molina Wegener]

>Number:         87872
>Category:       gnu
>Synopsis:       [PATCH] RELENG_5 gnu contrib make buildworld patch
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 23 14:40:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Daniel Molina Wegener
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
DMW
>Environment:
System: FreeBSD daemon.unete.cl 5.4-STABLE FreeBSD 5.4-STABLE #0: Sat Oct 22 01:15:30 CLST 2005 root at daemon.unete.cl:/usr/obj/usr/src/sys/PHOBOS i386

>Description:

   When the source tree is updated via cvsup using RELENG_5 branch,
and then a make buildworld command is executed, you get some errors
compiling gnu source code from the contrib modules.

>How-To-Repeat:

   # cvsup -g -L 2 stable-supfile-releng5
   # cd /usr/src
   # make buildworld

>Fix:

   Unshar the patchset attached.

   # cd /usr
   # patch < pr-20051022-gnu-patchset
   # make buildworld

   Here is the patchset.

echo x - pr-20051022-gnu-patchset
sed 's/^X//' >pr-20051022-gnu-patchset << 'END-of-pr-20051022-gnu-patchset'
X--- src/gnu/lib/libstdc++/Makefile	Wed Mar  2 01:09:38 2005
X+++ src/gnu/lib/libstdc++/Makefile.new	Fri Oct 21 20:45:43 2005
X@@ -14,6 +14,8 @@
X CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
X CFLAGS+=	-I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include
X CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
X+CXXFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
X+CXXFLAGS+=	-I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include
X CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections \
X 		-Wno-deprecated
X 
X--- src/gnu/lib/libsupc++/Makefile	Wed Jul 28 01:27:19 2004
X+++ src/gnu/lib/libsupc++/Makefile.new	Fri Oct 21 21:14:22 2005
X@@ -18,6 +18,8 @@
X 
X CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
X CFLAGS+=	-I${SRCDIR} -I${GCCDIR} -I${.CURDIR}/../libstdc++
X+CXXFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
X+CXXFLAGS+=	-I${SRCDIR} -I${GCCDIR} -I${.CURDIR}/../libstdc++
X CXXFLAGS+=	-fno-implicit-templates -ffunction-sections -fdata-sections
X 
X HDRS=	exception new typeinfo cxxabi.h exception_defines.h
X--- src/gnu/usr.bin/groff/Makefile.inc	Mon Aug  4 17:31:52 2003
X+++ src/gnu/usr.bin/groff/Makefile.inc.new	Fri Oct 21 22:12:26 2005
X@@ -76,8 +76,11 @@
X LIBBIB=		${.CURDIR}/${TOPREL}/src/libs/libbib/libbib.a
X .endif
X 
X+
X CFLAGS+=	-DHAVE_CONFIG_H
X CFLAGS+=	-I${GROFF_DIST}/src/include -I${.CURDIR}/${TOPREL}/src/include
X+CXXFLAGS+=	-DHAVE_CONFIG_H
X+CXXFLAGS+=	-I${GROFF_DIST}/src/include -I${.CURDIR}/${TOPREL}/src/include
X CXXFLAGS+=	-fno-rtti -fno-exceptions
X 
X .y.o:
X--- src/gnu/usr.bin/groff/src/preproc/eqn/Makefile	Thu May  1 09:22:19 2003
X+++ src/gnu/usr.bin/groff/src/preproc/eqn/Makefile.new	Fri Oct 21 23:16:42 2005
X@@ -5,6 +5,7 @@
X 		box.cpp limit.cpp list.cpp over.cpp text.cpp \
X 		script.cpp mark.cpp other.cpp delim.cpp sqrt.cpp pile.cpp special.cpp
X CFLAGS+=	-I${DIST_DIR} -I.
X+CXXFLAGS+=	-I${DIST_DIR} -I.
X DPADD=		${LIBGROFF}
X LDADD=		${LIBGROFF}
X SCRIPTS=	neqn
X--- src/gnu/usr.bin/groff/src/preproc/pic/Makefile	Thu May  1 09:22:20 2003
X+++ src/gnu/usr.bin/groff/src/preproc/pic/Makefile.new	Fri Oct 21 23:17:26 2005
X@@ -4,6 +4,7 @@
X SRCS=		lex.cpp main.cpp object.cpp pic.cpp pic_tab.h \
X 		common.cpp troff.cpp tex.cpp
X CFLAGS+=	-I${DIST_DIR} -I.
X+CXXFLAGS+=	-I${DIST_DIR} -I.
X DPADD=		${LIBGROFF} ${LIBM}
X LDADD=		${LIBGROFF} -lm
X CLEANFILES=	${MAN} pic.cpp pic_tab.h y.tab.c y.tab.h
X--- src/gnu/usr.bin/groff/src/preproc/refer/Makefile	Thu May  1 09:22:20 2003
X+++ src/gnu/usr.bin/groff/src/preproc/refer/Makefile.new	Fri Oct 21 23:18:37 2005
X@@ -3,6 +3,7 @@
X PROG_CXX=	refer
X SRCS=		command.cpp label.cpp ref.cpp refer.cpp token.cpp
X CFLAGS+=	-I${DIST_DIR}
X+CXXFLAGS+=	-I${DIST_DIR}
X DPADD=		${LIBBIB} ${LIBGROFF} ${LIBM}
X LDADD=		${LIBBIB} ${LIBGROFF} -lm
X CLEANFILES=	label.cpp label_tab.h ${MAN} y.tab.c y.tab.h
X--- src/share/mk/bsd.dep.mk	Fri Mar 12 18:36:12 2004
X+++ src/share/mk/bsd.dep.mk.new	Fri Oct 21 20:14:28 2005
X@@ -137,6 +137,7 @@
X 
X DPSRCS+= ${SRCS}
X ${DEPENDFILE}: ${DPSRCS}
X+        @echo "mkdep for ${DEPENDFILE} on ${.CURDIR}"
X 	rm -f ${DEPENDFILE}
X .if !empty(DPSRCS:M*.[cS])
X 	${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \
END-of-pr-20051022-gnu-patchset
exit

>Release-Note:
>Audit-Trail:
>Unformatted: