From christoph.mallon@gmx.de  Sun Apr 14 10:11:43 2013
Return-Path: <christoph.mallon@gmx.de>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 6427425D
	for <freebsd-gnats-submit@freebsd.org>; Sun, 14 Apr 2013 10:11:43 +0000 (UTC)
	(envelope-from christoph.mallon@gmx.de)
Received: from mout.gmx.net (mout.gmx.net [212.227.17.21])
	by mx1.freebsd.org (Postfix) with ESMTP id 13D8A95A
	for <freebsd-gnats-submit@freebsd.org>; Sun, 14 Apr 2013 10:11:42 +0000 (UTC)
Received: from mailout-de.gmx.net ([10.1.76.27]) by mrigmx.server.lan
 (mrigmx001) with ESMTP (Nemesis) id 0MaGJS-1U7bAN3wUq-00Jppk for
 <FreeBSD-gnats-submit@freebsd.org>; Sun, 14 Apr 2013 12:11:35 +0200
Received: (qmail invoked by alias); 14 Apr 2013 10:11:35 -0000
Received: from p5B1311A3.dip.t-dialin.net (EHLO rotluchs.lokal) [91.19.17.163]
  by mail.gmx.net (mp027) with SMTP; 14 Apr 2013 12:11:35 +0200
Received: from tron by rotluchs.lokal with local (Exim 4.80.1 (FreeBSD))
	(envelope-from <christoph.mallon@gmx.de>)
	id 1URJuH-000KiY-Vc; Sun, 14 Apr 2013 12:11:33 +0200
Message-Id: <E1URJuH-000KiY-Vc@rotluchs.lokal>
Date: Sun, 14 Apr 2013 12:11:33 +0200
From: Christoph Mallon <christoph.mallon@gmx.de>
Reply-To: Christoph Mallon <christoph.mallon@gmx.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Christoph Mallon <christoph.mallon@gmx.de>
Subject: [patch] devel/cross-binutils: Fix and update to 2.23.2
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         177851
>Category:       ports
>Synopsis:       [patch] devel/cross-binutils: Fix and update to 2.23.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 14 10:20:00 UTC 2013
>Closed-Date:    Sat Apr 27 18:20:38 UTC 2013
>Last-Modified:  Sat Apr 27 18:30:00 UTC 2013
>Originator:     Christoph Mallon
>Release:        
>Organization:
>Environment:


	
>Description:
Currently devel/cross-binutils is broken for mips and ppc.
For mips no gprof is built, so installing fails.
Building fails for ppc in version 2.21.
These patches also trim the Makefile header and add an option for the switch WITH_RTEMS_PATCHES

>How-To-Repeat:
	
>Fix:
Please apply these patches.

--- 0001-devel-cross-binutils-mips-does-not-build-gprof.patch begins here ---
From 251dbcc3d1d2cb91ad09c933d4a625c31cc19a8c Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Sat, 13 Apr 2013 13:28:31 +0200
Subject: [PATCH 1/4] devel/cross-binutils: mips does not build gprof.

---
 devel/cross-binutils/Makefile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/devel/cross-binutils/Makefile b/devel/cross-binutils/Makefile
index 28d5cab..11f9d11 100644
--- a/devel/cross-binutils/Makefile
+++ b/devel/cross-binutils/Makefile
@@ -36,7 +36,6 @@ MAN1=		${OURTARGET}-addr2line.1 \
 		${OURTARGET}-as.1 \
 		${OURTARGET}-c++filt.1 \
 		${OURTARGET}-elfedit.1 \
-		${OURTARGET}-gprof.1 \
 		${OURTARGET}-dlltool.1 \
 		${OURTARGET}-ld.1 \
 		${OURTARGET}-nlmconv.1 \
@@ -54,7 +53,6 @@ MAN1=		${OURTARGET}-addr2line.1 \
 INFO=		${OURTARGET}-as \
 		${OURTARGET}-bfd \
 		${OURTARGET}-binutils \
-		${OURTARGET}-gprof \
 		${OURTARGET}-ld
 
 PLIST_FILES=	bin/${OURTARGET}-addr2line \
@@ -62,7 +60,6 @@ PLIST_FILES=	bin/${OURTARGET}-addr2line \
 		bin/${OURTARGET}-as \
 		bin/${OURTARGET}-c++filt \
 		bin/${OURTARGET}-elfedit \
-		bin/${OURTARGET}-gprof \
 		bin/${OURTARGET}-ld \
 		bin/${OURTARGET}-ld.bfd \
 		bin/${OURTARGET}-nm \
@@ -74,6 +71,12 @@ PLIST_FILES=	bin/${OURTARGET}-addr2line \
 		bin/${OURTARGET}-strings \
 		bin/${OURTARGET}-strip
 
+.if defined(TGTARCH) && ${TGTARCH} != mips
+MAN1+=		${OURTARGET}-gprof.1
+INFO+=		${OURTARGET}-gprof
+PLIST_FILES+=	bin/${OURTARGET}-gprof
+.endif
+
 .if defined(TGTABI) && (${TGTABI} == "pc-mingw32" || ${TGTABI} == "mingw32")
 PLIST_FILES+=	bin/${OURTARGET}-dlltool \
 		bin/${OURTARGET}-dllwrap \
-- 
1.8.2
--- 0001-devel-cross-binutils-mips-does-not-build-gprof.patch ends here ---

--- dummy1 begins here ---
dummy file, because GNATS damages every other file
--- dummy1 ends here ---

--- 0002-devel-cross-binutils-Update-to-2.23.2.patch begins here ---
From 2269b678c2aacd6be0ccc6a42707515e49826301 Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Sat, 13 Apr 2013 13:15:25 +0200
Subject: [PATCH 2/4] devel/cross-binutils: Update to 2.23.2.

This unbreaks powerpc-elf and powerpc in general.
---
 devel/cross-binutils/Makefile | 7 ++-----
 devel/cross-binutils/distinfo | 8 ++++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/devel/cross-binutils/Makefile b/devel/cross-binutils/Makefile
index 11f9d11..914b0e8 100644
--- a/devel/cross-binutils/Makefile
+++ b/devel/cross-binutils/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	binutils
-PORTVERSION=	2.21
+PORTVERSION=	2.23.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
 MASTER_SITE_SUBDIR=	binutils/releases
@@ -85,16 +85,13 @@ PLIST_FILES+=	bin/${OURTARGET}-dlltool \
 .endif
 
 .if defined(WITH_RTEMS_PATCHES)
-PATCHFILES+=	${PORTNAME}-${PORTVERSION}-rtems4.11-20110107.diff
+PATCHFILES+=	${PORTNAME}-${PORTVERSION}-rtems4.11-20130326.diff
 .endif
 
 .if !defined(TGTARCH) || !defined(TGTABI)
 PKGNAMEPREFIX=	cross-
 IGNORE=		you should define TGTARCH and TGTABI to build port
 .endif
-.if defined(TGTARCH) && (${TGTABI} == "elf" && ${TGTARCH} == "powerpc")
-IGNORE=		will not build with TGTARCH=powerpc and TGTABI=elf
-.endif
 
 #
 # Macro to fix up info referencies
diff --git a/devel/cross-binutils/distinfo b/devel/cross-binutils/distinfo
index a793343..7d6e936 100644
--- a/devel/cross-binutils/distinfo
+++ b/devel/cross-binutils/distinfo
@@ -1,4 +1,4 @@
-SHA256 (binutils-2.21.tar.bz2) = 60abec5bf448eb930a5a15acb8712612377dc8bcfb13dfd5131228f70561d0c7
-SIZE (binutils-2.21.tar.bz2) = 18742991
-SHA256 (binutils-2.21-rtems4.11-20110107.diff) = a57150ba5ff28aaac08624d00ff88ba3f12d54efab16094c8ec6c3ae71d6fe39
-SIZE (binutils-2.21-rtems4.11-20110107.diff) = 2276
+SHA256 (binutils-2.23.2.tar.bz2) = fe914e56fed7a9ec2eb45274b1f2e14b0d8b4f41906a5194eac6883cfe5c1097
+SIZE (binutils-2.23.2.tar.bz2) = 21440347
+SHA256 (binutils-2.23.2-rtems4.11-20130326.diff) = 806c44d2987088b9c4752a769cacff89c495366f8c3222e13fae7622a8ff662f
+SIZE (binutils-2.23.2-rtems4.11-20130326.diff) = 7844
-- 
1.8.2
--- 0002-devel-cross-binutils-Update-to-2.23.2.patch ends here ---

--- dummy2 begins here ---
dummy file, because GNATS damages every other file
--- dummy2 ends here ---

--- 0003-devel-cross-binutils-Add-options.patch begins here ---
From 80ebb78e2e41157ff46f5966334bd286d5020187 Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Sat, 13 Apr 2013 13:30:42 +0200
Subject: [PATCH 3/4] devel/cross-binutils: Add options.

---
 devel/cross-binutils/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/devel/cross-binutils/Makefile b/devel/cross-binutils/Makefile
index 914b0e8..e97fb62 100644
--- a/devel/cross-binutils/Makefile
+++ b/devel/cross-binutils/Makefile
@@ -24,6 +24,12 @@ GNU_CONFIGURE=	yes
 ALL_TARGET=	all info
 MAKE_JOBS_UNSAFE=	yes
 
+OPTIONS_DEFINE=	RTEMS_PATCHES
+
+RTEMS_PATCHES_DESC=	Apply RTEMS patches
+
+.include <bsd.port.options.mk>
+
 CONFIGURE_ARGS+=	--disable-nls \
 			--with-system-zlib \
 			--target=${OURTARGET} \
-- 
1.8.2
--- 0003-devel-cross-binutils-Add-options.patch ends here ---

--- dummy3 begins here ---
dummy file, because GNATS damages every other file
--- dummy3 ends here ---

--- 0004-devel-cross-binutils-Trim-header.patch begins here ---
From 96cb9eb21122c7379432778163e81621a9e82820 Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon@gmx.de>
Date: Sat, 13 Apr 2013 15:07:01 +0200
Subject: [PATCH 4/4] devel/cross-binutils: Trim header.

---
 devel/cross-binutils/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/devel/cross-binutils/Makefile b/devel/cross-binutils/Makefile
index e97fb62..a6979ff 100644
--- a/devel/cross-binutils/Makefile
+++ b/devel/cross-binutils/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cross-binutils
-# Date created:		8 August 2006
-# Whom:			Stanislav Sedov <stas@FreeBSD.org>
-#
+# Created by: Stanislav Sedov <stas@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	binutils
 PORTVERSION=	2.23.2
-- 
1.8.2
--- 0004-devel-cross-binutils-Trim-header.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Thu Apr 18 21:00:54 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177851 
State-Changed-From-To: open->feedback 
State-Changed-By: crees 
State-Changed-When: Sat Apr 20 10:24:03 UTC 2013 
State-Changed-Why:  
Leaves stuff behind? (At least for i386-elf!) 
http://www.bayofrum.net/tb/index.php?action=display_markup_log&build=9-local&id=2394 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177851 
State-Changed-From-To: feedback->closed 
State-Changed-By: crees 
State-Changed-When: Sat Apr 27 18:20:37 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177851 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177851: commit references a PR
Date: Sat, 27 Apr 2013 18:20:06 +0000 (UTC)

 Author: crees
 Date: Sat Apr 27 18:19:58 2013
 New Revision: 316682
 URL: http://svnweb.freebsd.org/changeset/ports/316682
 
 Log:
   devel/cross-binutils: Fix and update to 2.23.2
   
   - For mips no gprof was built, so installing failed.
   - Building failed for ppc in version 2.21.
   - Add an option for the switch WITH_RTEMS_PATCHES
   
   Christoph has also valiantly agreed to be set as MAINTAINER.
   
   PR:		ports/177851
   Submitted by:	Christoph Mallon <christoph.mallon@gmx.de>
 
 Modified:
   head/devel/cross-binutils/Makefile
   head/devel/cross-binutils/distinfo
 
 Modified: head/devel/cross-binutils/Makefile
 ==============================================================================
 --- head/devel/cross-binutils/Makefile	Sat Apr 27 18:15:50 2013	(r316681)
 +++ head/devel/cross-binutils/Makefile	Sat Apr 27 18:19:58 2013	(r316682)
 @@ -1,12 +1,10 @@
 -# New ports collection makefile for:	cross-binutils
 -# Date created:		8 August 2006
 -# Whom:			Stanislav Sedov <stas@FreeBSD.org>
 -#
 +TGTARCH=	i386
 +TGTABI=		elf
 +# Created by: Stanislav Sedov <stas@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	binutils
 -PORTVERSION=	2.21
 +PORTVERSION=	2.23.2
  CATEGORIES=	devel
  MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
  MASTER_SITE_SUBDIR=	binutils/releases
 @@ -15,7 +13,7 @@ PKGNAMEPREFIX=	${TGTARCH}-${TGTABI}-
  PATCH_SITES=	ftp://ftp.rtems.com/pub/rtems/SOURCES/4.11/
  PATCH_DIST_STRIP=	-p1
  
 -MAINTAINER=	ports@FreeBSD.org
 +MAINTAINER=	christoph.mallon@gmx.de
  COMMENT=	GNU binutils port for cross-target development
  
  USE_BZIP2=	yes
 @@ -24,6 +22,12 @@ GNU_CONFIGURE=	yes
  ALL_TARGET=	all info
  MAKE_JOBS_UNSAFE=	yes
  
 +OPTIONS_DEFINE=		RTEMS_PATCHES
 +
 +RTEMS_PATCHES_DESC=	Apply RTEMS patches
 +
 +.include <bsd.port.options.mk>
 +
  CONFIGURE_ARGS+=	--disable-nls \
  			--with-system-zlib \
  			--target=${OURTARGET} \
 @@ -36,7 +40,6 @@ MAN1=		${OURTARGET}-addr2line.1 \
  		${OURTARGET}-as.1 \
  		${OURTARGET}-c++filt.1 \
  		${OURTARGET}-elfedit.1 \
 -		${OURTARGET}-gprof.1 \
  		${OURTARGET}-dlltool.1 \
  		${OURTARGET}-ld.1 \
  		${OURTARGET}-nlmconv.1 \
 @@ -54,15 +57,15 @@ MAN1=		${OURTARGET}-addr2line.1 \
  INFO=		${OURTARGET}-as \
  		${OURTARGET}-bfd \
  		${OURTARGET}-binutils \
 -		${OURTARGET}-gprof \
 -		${OURTARGET}-ld
 +		${OURTARGET}-ld \
 +		configure \
 +		standards
  
  PLIST_FILES=	bin/${OURTARGET}-addr2line \
  		bin/${OURTARGET}-ar \
  		bin/${OURTARGET}-as \
  		bin/${OURTARGET}-c++filt \
  		bin/${OURTARGET}-elfedit \
 -		bin/${OURTARGET}-gprof \
  		bin/${OURTARGET}-ld \
  		bin/${OURTARGET}-ld.bfd \
  		bin/${OURTARGET}-nm \
 @@ -74,24 +77,27 @@ PLIST_FILES=	bin/${OURTARGET}-addr2line 
  		bin/${OURTARGET}-strings \
  		bin/${OURTARGET}-strip
  
 -.if defined(TGTABI) && (${TGTABI} == "pc-mingw32" || ${TGTABI} == "mingw32")
 +.if defined(TGTARCH) && ${TGTARCH} != mips
 +MAN1+=		${OURTARGET}-gprof.1
 +INFO+=		${OURTARGET}-gprof
 +PLIST_FILES+=	bin/${OURTARGET}-gprof
 +.endif
 +
 +.if defined(TGTABI) && (${TGTABI} == pc-mingw32 || ${TGTABI} == mingw32)
  PLIST_FILES+=	bin/${OURTARGET}-dlltool \
  		bin/${OURTARGET}-dllwrap \
  		bin/${OURTARGET}-windmc \
  		bin/${OURTARGET}-windres
  .endif
  
 -.if defined(WITH_RTEMS_PATCHES)
 -PATCHFILES+=	${PORTNAME}-${PORTVERSION}-rtems4.11-20110107.diff
 +.if ${PORT_OPTIONS:MRTEMS_PATCHES}
 +PATCHFILES+=	${PORTNAME}-${PORTVERSION}-rtems4.11-20130326.diff
  .endif
  
  .if !defined(TGTARCH) || !defined(TGTABI)
  PKGNAMEPREFIX=	cross-
  IGNORE=		you should define TGTARCH and TGTABI to build port
  .endif
 -.if defined(TGTARCH) && (${TGTABI} == "elf" && ${TGTARCH} == "powerpc")
 -IGNORE=		will not build with TGTARCH=powerpc and TGTABI=elf
 -.endif
  
  #
  # Macro to fix up info referencies
 @@ -139,8 +145,8 @@ post-patch:
  
  post-install:
  #
 -# Add some plist items (we don't list them directly, since the set vary
 -# accross different targets
 +# Add some plist items (we don't list them directly, since the set varies
 +# across different targets)
  #
  	@${FIND} -ds ${PREFIX}/${OURTARGET} ! -type d | \
  		${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST}
 
 Modified: head/devel/cross-binutils/distinfo
 ==============================================================================
 --- head/devel/cross-binutils/distinfo	Sat Apr 27 18:15:50 2013	(r316681)
 +++ head/devel/cross-binutils/distinfo	Sat Apr 27 18:19:58 2013	(r316682)
 @@ -1,4 +1,4 @@
 -SHA256 (binutils-2.21.tar.bz2) = 60abec5bf448eb930a5a15acb8712612377dc8bcfb13dfd5131228f70561d0c7
 -SIZE (binutils-2.21.tar.bz2) = 18742991
 -SHA256 (binutils-2.21-rtems4.11-20110107.diff) = a57150ba5ff28aaac08624d00ff88ba3f12d54efab16094c8ec6c3ae71d6fe39
 -SIZE (binutils-2.21-rtems4.11-20110107.diff) = 2276
 +SHA256 (binutils-2.23.2.tar.bz2) = fe914e56fed7a9ec2eb45274b1f2e14b0d8b4f41906a5194eac6883cfe5c1097
 +SIZE (binutils-2.23.2.tar.bz2) = 21440347
 +SHA256 (binutils-2.23.2-rtems4.11-20130326.diff) = 806c44d2987088b9c4752a769cacff89c495366f8c3222e13fae7622a8ff662f
 +SIZE (binutils-2.23.2-rtems4.11-20130326.diff) = 7844
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
