Date: Sun, 14 Apr 2013 12:11:33 +0200 From: Christoph Mallon <christoph.mallon@gmx.de> To: FreeBSD-gnats-submit@freebsd.org Cc: Christoph Mallon <christoph.mallon@gmx.de> Subject: ports/177851: [patch] devel/cross-binutils: Fix and update to 2.23.2 Message-ID: <E1URJuH-000KiY-Vc@rotluchs.lokal> Resent-Message-ID: <201304141020.r3EAK08D030429@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177851
>Category: ports
>Synopsis: [patch] devel/cross-binutils: Fix and update to 2.23.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 14 10:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1URJuH-000KiY-Vc>