Retire USE_PKGLIBTOOL in favour of USE_LIBTOOL.

Use LTCONFIG_OVERRIDE, and thus remove four patches.
Update PLIST for arm and mipse[bl] additions.

7 files changed, 19 insertions, 92 deletions

diff --git a/cross/binutils/Makefile b/cross/binutils/Makefile
index 996d1ed058b..767b2228460 100644
--- a/cross/binutils/Makefile
+++ b/cross/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/06/01 11:23:18 rh Exp $
+# $NetBSD: Makefile,v 1.19 2000/08/14 14:57:52 wiz Exp $
 #
 # GNU binutils configured to hold `as many targets as the cross system is
 # capable of using'.  Configures and builds everything except gas, which
@@ -13,7 +13,8 @@ MAINTAINER=		tv@netbsd.org
 HOMEPAGE=		http://www.gnu.org/
 
 USE_CROSSBASE=		yes
-USE_PKGLIBTOOL=		yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-64-bit-bfd
diff --git a/cross/binutils/files/patch-sum b/cross/binutils/files/patch-sum
index d303e001517..8af2f5487f5 100644
--- a/cross/binutils/files/patch-sum
+++ b/cross/binutils/files/patch-sum
@@ -1,13 +1,9 @@
-$NetBSD: patch-sum,v 1.1 2000/08/09 10:39:48 jun Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/14 14:57:54 wiz Exp $
 
 MD5 (patch-aa) = ada1c082c4558f36129d80481e6d259a
 MD5 (patch-ab) = a5d51269ccf1c469d9df710427aadf04
 MD5 (patch-ac) = 35977516832bbee30eecb839d4b5e74c
-MD5 (patch-ad) = d32e37966ea37fd20a012063e92d3e26
-MD5 (patch-ae) = 79f323be5768a87aa723f30f88527ed8
 MD5 (patch-af) = 2901cb223115cdf1103df469dad2abad
-MD5 (patch-ag) = 95be6e1c33357050ec89221a2a1072ef
-MD5 (patch-ah) = 3021ac1de51eb71fc58455f4713c942f
 MD5 (patch-ai) = 828307f10a0fb177c89bfd1806c6e8aa
 MD5 (patch-aj) = 8b44272fa18007c17f70f551cdee8ad6
 MD5 (patch-ak) = ad1a6595440ca966acd8aef98788a07b
diff --git a/cross/binutils/patches/patch-ad b/cross/binutils/patches/patch-ad
deleted file mode 100644
index dd0b32c7ab4..00000000000
--- a/cross/binutils/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.1 1999/01/04 22:37:31 tv Exp $
-
---- bfd/configure.orig	Thu Dec 31 14:13:13 1998
-+++ bfd/configure	Thu Dec 31 14:13:32 1998
-@@ -1398,6 +1398,7 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -1443,7 +1444,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
--
-+fi
- 
- # Check whether --enable-64-bit-bfd or --disable-64-bit-bfd was given.
- if test "${enable_64_bit_bfd+set}" = set; then
diff --git a/cross/binutils/patches/patch-ae b/cross/binutils/patches/patch-ae
deleted file mode 100644
index 67765e7f0a2..00000000000
--- a/cross/binutils/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/01/04 22:37:32 tv Exp $
-
---- opcodes/configure.orig	Thu Dec 31 14:13:46 1998
-+++ opcodes/configure	Thu Dec 31 14:14:00 1998
-@@ -1380,6 +1380,7 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -1425,7 +1426,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
--
-+fi
- 
- # Check whether --enable-targets or --disable-targets was given.
- if test "${enable_targets+set}" = set; then
diff --git a/cross/binutils/patches/patch-ag b/cross/binutils/patches/patch-ag
deleted file mode 100644
index 72a289028c3..00000000000
--- a/cross/binutils/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1999/01/04 22:37:32 tv Exp $
-
---- ld/configure.orig	Thu Dec 31 15:21:31 1998
-+++ ld/configure	Thu Dec 31 15:21:46 1998
-@@ -1269,6 +1269,7 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -1314,7 +1315,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
--
-+fi
- 
- # Check whether --enable-targets or --disable-targets was given.
- if test "${enable_targets+set}" = set; then
diff --git a/cross/binutils/patches/patch-ah b/cross/binutils/patches/patch-ah
deleted file mode 100644
index 755e4673018..00000000000
--- a/cross/binutils/patches/patch-ah
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1999/01/04 22:37:32 tv Exp $
-
---- binutils/configure.orig	Thu Dec 31 15:22:04 1998
-+++ binutils/configure	Thu Dec 31 15:22:17 1998
-@@ -1269,6 +1269,7 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
-+if false; then
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
-@@ -1314,7 +1315,7 @@
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
--
-+fi
- 
- # Check whether --enable-targets or --disable-targets was given.
- if test "${enable_targets+set}" = set; then
diff --git a/cross/binutils/pkg/PLIST b/cross/binutils/pkg/PLIST
index 406ce77e720..f5aa82a9967 100644
--- a/cross/binutils/pkg/PLIST
+++ b/cross/binutils/pkg/PLIST
@@ -1,10 +1,21 @@
-@comment $NetBSD: PLIST,v 1.4 1999/12/18 02:14:39 wrstuden Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/08/14 14:57:55 wiz Exp $
+lib/ldscripts/armnbsd.x
+lib/ldscripts/armnbsd.xbn
+lib/ldscripts/armnbsd.xn
+lib/ldscripts/armnbsd.xr
+lib/ldscripts/armnbsd.xu
 lib/ldscripts/elf32_sparc.x
 lib/ldscripts/elf32_sparc.xbn
 lib/ldscripts/elf32_sparc.xn
 lib/ldscripts/elf32_sparc.xr
 lib/ldscripts/elf32_sparc.xs
 lib/ldscripts/elf32_sparc.xu
+lib/ldscripts/elf32ebmip.x
+lib/ldscripts/elf32ebmip.xbn
+lib/ldscripts/elf32ebmip.xn
+lib/ldscripts/elf32ebmip.xr
+lib/ldscripts/elf32ebmip.xs
+lib/ldscripts/elf32ebmip.xu
 lib/ldscripts/elf32lmip.x
 lib/ldscripts/elf32lmip.xbn
 lib/ldscripts/elf32lmip.xn
@@ -92,9 +103,12 @@ include/ansidecl.h
 include/bfd.h
 lib/libbfd-2.9.1.so.0.0
 lib/libbfd.a
+lib/libbfd.la
 lib/libopcodes-2.9.1.so.0.0
 lib/libopcodes.a
+lib/libopcodes.la
 lib/libiberty.a
+@unexec rm -f %D/lib/libbfd.so %D/lib/libopcodes.so 2> /dev/null || true
 libexec/binutils/addr2line
 libexec/binutils/ar
 libexec/binutils/dlltool