- Fix build on -CURRENT

- Mark ONLY_FOR_ARCHS = i386

PR:		ports/58502
Submitted by:	elvis <elvis@sslab.cs.ccu.edu.tw>

3 files changed, 34 insertions, 5 deletions

diff --git a/devel/arm-elf-gcc295/Makefile b/devel/arm-elf-gcc295/Makefile
index a5ccd0dd1718..6c8d18e3dfc2 100644
--- a/devel/arm-elf-gcc295/Makefile
+++ b/devel/arm-elf-gcc295/Makefile
@@ -17,13 +17,15 @@ DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
 		gcc-g77-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	esk@ira.uka.de
-COMMENT=	GNU cross compiler suite for vanilla ARM targets.
+COMMENT=	GNU cross compiler suite for vanilla ARM targets
 
 BUILD_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 		${PKGNAMEPREFIX}ld:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
 RUN_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils \
 		${PKGNAMEPREFIX}ld:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
 
+ONLY_FOR_ARCHS=	i386
+
 GCC_REV=	${DISTNAME:S/gcc-//g}
 PLIST_SUB+=	GCC_REV=${GCC_REV}
 USE_PERL5=	yes
@@ -43,10 +45,6 @@ MAN1=		${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}gcc.1 cccp.1
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 .if !defined(DEFAULT_CPU)
 pre-extract:
 	@${ECHO}
@@ -55,6 +53,12 @@ pre-extract:
 	@${ECHO}
 .endif
 
+.if ${OSVERSION} >= 500113
+post-patch:
+	@(cd ${PATCH_WRKSRC} && ${PATCH} < ${PATCHDIR}/libiberty-strerror.c && \
+	${PATCH} < ${PATCHDIR}/libiberty-strsignal.c)
+.endif
+
 post-configure:
 	${REINPLACE_CMD} -Ee 's,^(TARGET_CONFIGDIRS\s*=),\1#,' \
 	    ${WRKSRC}/Makefile
diff --git a/devel/arm-elf-gcc295/files/libiberty-strerror.c b/devel/arm-elf-gcc295/files/libiberty-strerror.c
new file mode 100644
index 000000000000..28474c2b390d
--- /dev/null
+++ b/devel/arm-elf-gcc295/files/libiberty-strerror.c
@@ -0,0 +1,14 @@
+--- libiberty/strerror.c.orig	Sat Oct 25 06:08:26 2003
++++ libiberty/strerror.c	Sat Oct 25 06:08:35 2003
+@@ -460,11 +460,6 @@
+ static int sys_nerr;
+ static const char **sys_errlist;
+ 
+-#else
+-
+-extern int sys_nerr;
+-extern char *sys_errlist[];
+-
+ #endif
+ 
+ 
diff --git a/devel/arm-elf-gcc295/files/libiberty-strsignal.c b/devel/arm-elf-gcc295/files/libiberty-strsignal.c
new file mode 100644
index 000000000000..7f49317a9073
--- /dev/null
+++ b/devel/arm-elf-gcc295/files/libiberty-strsignal.c
@@ -0,0 +1,11 @@
+--- libiberty/strsignal.c.orig	Sat Oct 25 06:10:58 2003
++++ libiberty/strsignal.c	Sat Oct 25 06:13:09 2003
+@@ -244,7 +244,7 @@
+ #else
+ 
+ #ifdef NSIG
+-static int sys_nsig = NSIG;
++static __const int sys_nsig = NSIG;
+ #else
+ #ifdef _NSIG
+ static int sys_nsig = _NSIG;