Don't install libiberty library archive to avoid conflict with mingw-gcc package.

Bump package revision.

4 files changed, 35 insertions, 4 deletions

diff --git a/cross/mingw-binutils/Makefile b/cross/mingw-binutils/Makefile
index 85afa0d9720..85e0ba28e59 100644
--- a/cross/mingw-binutils/Makefile
+++ b/cross/mingw-binutils/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/03/15 18:34:36 asau Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/24 20:06:28 asau Exp $
 
 DISTNAME=	binutils-2.18
 PKGNAME=	mingw-${DISTNAME:S/-src//}
+PKGREVISION=	1
 CATEGORIES=	cross
 MASTER_SITES=	${MASTER_SITE_GNU:=binutils/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/cross/mingw-binutils/PLIST b/cross/mingw-binutils/PLIST
index 8e3e838b8dc..515c40aff7a 100644
--- a/cross/mingw-binutils/PLIST
+++ b/cross/mingw-binutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/03/15 18:34:36 asau Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/06/24 20:06:28 asau Exp $
 bin/${MINGW_TARGET}-addr2line
 bin/${MINGW_TARGET}-ar
 bin/${MINGW_TARGET}-as
@@ -40,7 +40,6 @@ info/configure.info
 info/gprof.info
 info/ld.info
 info/standards.info
-lib/libiberty.a
 man/man1/${MINGW_TARGET}-addr2line.1
 man/man1/${MINGW_TARGET}-ar.1
 man/man1/${MINGW_TARGET}-as.1
diff --git a/cross/mingw-binutils/distinfo b/cross/mingw-binutils/distinfo
index 62e93b877c0..2199f739043 100644
--- a/cross/mingw-binutils/distinfo
+++ b/cross/mingw-binutils/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/03/15 18:34:36 asau Exp $
+$NetBSD: distinfo,v 1.2 2010/06/24 20:06:28 asau Exp $
 
 SHA1 (binutils-2.18.tar.bz2) = fdec92e9dfc6c32155869f3910f47041c78e2277
 RMD160 (binutils-2.18.tar.bz2) = 78d07475667c55ecbf9068dbb90362a3445b2a99
 Size (binutils-2.18.tar.bz2) = 14962245 bytes
 SHA1 (patch-aa) = d0eaca0996d6bc4858230e7c22a26d83336b6370
+SHA1 (patch-ab) = 6f9597edc73e8e195be2cc1938ccfc0925791482
diff --git a/cross/mingw-binutils/patches/patch-ab b/cross/mingw-binutils/patches/patch-ab
new file mode 100644
index 00000000000..70a9ba2c404
--- /dev/null
+++ b/cross/mingw-binutils/patches/patch-ab
@@ -0,0 +1,30 @@
+Don't install libiberty.a
+
+--- libiberty/Makefile.in.orig	2007-08-06 23:59:45.000000000 +0400
++++ libiberty/Makefile.in	2010-06-24 23:27:18.000000000 +0400
+@@ -353,9 +353,9 @@
+ MULTIOSDIR = `$(CC) $(LIBCFLAGS) -print-multi-os-directory`
+ install_to_libdir: all
+ 	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
+-	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
+-	( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
+-	mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
++#	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
++#	( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
++#	mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
+ 	if test -n "${target_header_dir}"; then \
+ 	  case "${target_header_dir}" in \
+ 	    /*)    thd=${target_header_dir};; \
+@@ -370,9 +370,9 @@
+ 
+ install_to_tooldir: all
+ 	${mkinstalldirs} $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)
+-	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n
+-	( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n; $(RANLIB) $(TARGETLIB)n )
+-	mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)
++#	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n
++#	( cd $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n; $(RANLIB) $(TARGETLIB)n )
++#	mv -f $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/$(MULTIOSDIR)/$(TARGETLIB)
+ 	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
+ 
+ # needed-list is used by libstdc++.  NEEDED is the list of functions