From ff6d2e99c7a73f2de81c278390bdc2363836336b Mon Sep 17 00:00:00 2001
From: Marc Espie <espie@cvs.openbsd.org>
Date: Tue, 25 Nov 2003 21:24:31 +0000
Subject: Build the new pieces of libiberty that gcc3 will want. Bump major
 because of changes in c++ demangler.

---
 gnu/lib/libiberty/Makefile.bsd-wrapper | 24 +++++++++++++++++++-----
 gnu/lib/libiberty/shlib_version        |  2 +-
 2 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'gnu/lib')

diff --git a/gnu/lib/libiberty/Makefile.bsd-wrapper b/gnu/lib/libiberty/Makefile.bsd-wrapper
index 542d8c68b0f..5b609648b78 100644
--- a/gnu/lib/libiberty/Makefile.bsd-wrapper
+++ b/gnu/lib/libiberty/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.2 2003/11/24 16:55:59 espie Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.3 2003/11/25 21:24:30 espie Exp $
 
 LIB=		iberty
 CPPFLAGS+=	-DHAVE_CONFIG_H -I$(.CURDIR) -I$(.CURDIR)/include -I$(.OBJDIR)
@@ -7,11 +7,16 @@ HOST_FILES!=	cat $(.OBJDIR)/needed-list 2>/dev/null||true
 
 .PATH: ${.CURDIR}/src
 
-SRCS=		argv.c choose-temp.c concat.c cplus-dem.c dyn-string.c \
+SRCS=		argv.c choose-temp.c concat.c cplus-dem.c cp-demangle.c \
+		dyn-string.c \
 		fdmatch.c getopt.c getopt1.c getpwd.c getruntime.c \
-		hashtab.c hex.c floatformat.c objalloc.c obstack.c \
-		pexecute.c spaces.c splay-tree.c strerror.c strsignal.c \
-		xatexit.c xexit.c xmalloc.c xstrerror.c xstrdup.c \
+		hashtab.c hex.c fibheap.c partition.c \
+		floatformat.c make-temp-file.c make-relative-prefix.c \
+		objalloc.c obstack.c oldhashtab.c \
+		pexecute.c safe-ctype.c spaces.c splay-tree.c \
+		strerror.c strsignal.c \
+		xatexit.c xexit.c xmalloc.c xmemdup xstrerror.c xstrdup.c \
+		physmem.c lbasename.c \
 		$(HOST_FILES)
 
 #		choose-temp.c fnmatch.c objalloc.c pexecute.c xstrdup.c \
@@ -39,4 +44,13 @@ config.status: Makefile.in configure
 		--prefix=/usr --with-local-prefix=/usr ${CF} \
 		&& touch config.status
 
+all:	libiberty.info
+
+libiberty.info:
+	makeinfo --no-split -I${.CURDIR}/src ${.CURDIR}/src/libiberty.texi
+
+afterinstall:
+	${INSTALL} ${INSTALL_COPY} -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} \
+	    libiberty.info $(DESTDIR)/usr/share/info
+
 .include <bsd.lib.mk>
diff --git a/gnu/lib/libiberty/shlib_version b/gnu/lib/libiberty/shlib_version
index 3066b9771e7..9c1551636c5 100644
--- a/gnu/lib/libiberty/shlib_version
+++ b/gnu/lib/libiberty/shlib_version
@@ -1,2 +1,2 @@
-major=5
+major=6
 minor=0
-- 
cgit v1.2.3