From b8ebf3c652955a195ce1e8af6ea48bb8dc55de7b Mon Sep 17 00:00:00 2001
From: mef <mef>
Date: Sun, 15 Jun 2014 15:54:41 +0000
Subject: (pkgsrc)   Remove libiberty work around (upstream)   Bump Version
 2.23.2 to 2.24   (From binutils-2.24/binutils/NEWS)  
 ---------------------------   Changes in 2.24:   * Objcopy now supports
 wildcard characters in command line options that take     section names.   *
 Add support for Altera Nios II.   (From binutils-2.24/ChangeLog)  
 ---------------------------     (cross_only): Remove target-libiberty.

---
 cross/avr-binutils/Makefile | 21 +++++++++------------
 cross/avr-binutils/PLIST    |  3 +--
 cross/avr-binutils/distinfo |  8 ++++----
 3 files changed, 14 insertions(+), 18 deletions(-)

(limited to 'cross/avr-binutils')

diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile
index 1a31c2db446..1a1f6471647 100644
--- a/cross/avr-binutils/Makefile
+++ b/cross/avr-binutils/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2013/12/31 00:56:17 mef Exp $
+# $NetBSD: Makefile,v 1.24 2014/06/15 15:54:41 mef Exp $
 
-DISTNAME=		binutils-2.23.2
+DISTNAME=		binutils-2.24
 PKGNAME=		${DISTNAME:S/^/avr-/}
 CATEGORIES=		cross
 MASTER_SITES=		${MASTER_SITE_GNU:=binutils/}
@@ -45,16 +45,6 @@ post-install:
 	${LIBTOOL} --mode install ${INSTALL_DATA} libbfd.la ${DESTDIR}${PREFIX}/avr/lib;	\
 	${INSTALL_DATA} bfd.h ${DESTDIR}${PREFIX}/avr/include;	\
 	)
-	# Rename to avoid conflict to native and other cross assembler.
-	# and clang differs its path so, (the same as h8300-elf-binutils).
-	# (SunOS 5.11 places at amd64 instead of x86_64)
-	(cd ${DESTDIR}${PREFIX};				\
-	for d in amd64/libiberty.a ${MACHINE_ARCH}/libiberty.a libiberty.a;	\
-	  do if [ -f lib/$$d ]; then				\
-		${MV}	lib/$$d	 avr/lib/libiberty.a;		\
-		break;						\
-	     fi;						\
-	  done;	)
 	# emulator/simulavr wants following header files
 	(cd ${WRKSRC}/include;					\
 	for f in ansidecl.h symcat.h; do			\
@@ -62,3 +52,10 @@ post-install:
 	done;	\
 	)
 .include "../../mk/bsd.pkg.mk"
+
+# ./configure.lineno: 3239: Syntax error: Missing '}'
+# Makefile:2991: recipe for target 'configure-opcodes' failed
+# gmake[1]: *** [configure-opcodes] Error 1
+# gmake[1]: Leaving directory 'cross/avr-binutils/work/binutils-2.24'
+# see avr-binutils
+PKGSRC_MAKE_ENV+=       SH=/bin/ksh
diff --git a/cross/avr-binutils/PLIST b/cross/avr-binutils/PLIST
index 77356fbefe3..9007438a48f 100644
--- a/cross/avr-binutils/PLIST
+++ b/cross/avr-binutils/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2013/08/07 02:41:30 mef Exp $
+@comment $NetBSD: PLIST,v 1.8 2014/06/15 15:54:41 mef Exp $
 avr/bin/ar
 avr/bin/as
 avr/bin/ld
@@ -97,7 +97,6 @@ avr/lib/ldscripts/avrxmega7.xn
 avr/lib/ldscripts/avrxmega7.xr
 avr/lib/ldscripts/avrxmega7.xu
 avr/lib/libbfd.la
-avr/lib/libiberty.a
 bin/avr-addr2line
 bin/avr-ar
 bin/avr-as
diff --git a/cross/avr-binutils/distinfo b/cross/avr-binutils/distinfo
index e35449f4b78..d6d1f22a110 100644
--- a/cross/avr-binutils/distinfo
+++ b/cross/avr-binutils/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2013/11/19 23:06:24 dsainty Exp $
+$NetBSD: distinfo,v 1.9 2014/06/15 15:54:41 mef Exp $
 
-SHA1 (binutils-2.23.2.tar.bz2) = 042c51073205ebaf88c272d6168f9deb71984b56
-RMD160 (binutils-2.23.2.tar.bz2) = 9788e2a8c4a7c74360919347c3bc72040e87b898
-Size (binutils-2.23.2.tar.bz2) = 21440347 bytes
+SHA1 (binutils-2.24.tar.bz2) = 7ac75404ddb3c4910c7594b51ddfc76d4693debb
+RMD160 (binutils-2.24.tar.bz2) = b4aa3ea5ba9d0d9f817b2cf136e7f911f692af8d
+Size (binutils-2.24.tar.bz2) = 22716802 bytes
 SHA1 (patch-ab) = e2bc22866d8e04b0d670509f3295da5f0e535ac8
 SHA1 (patch-ad) = 6d1acfd834c692abcc4f454db5f5107b7f77e34e
 SHA1 (patch-ae) = fff6693a610b26aa60e1d96ad634d15d11afbe05
-- 
cgit v1.2.3