ports/116836: [PATCH] devel/z80-asm: Fix build with gcc 4.2

[Martin Wilke]

>Number:         116836
>Category:       ports
>Synopsis:       [PATCH] devel/z80-asm: Fix build with gcc 4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 02 17:10:06 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Martin Wilke
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD miwi.homeunix.com 7.0-CURRENT FreeBSD 7.0-CURRENT #305: Fri Sep 28 12:07:59 CEST 2007
>Description:
- Unbreak
- Fix build with gcc 4.2

Tindy tested:
i386
http://head.miwibox.org/tb/index.php?action=describe_port&id=2165
amd64
http://amd64.miwibox.org/tb/index.php?action=describe_port&id=1606

Added file(s):
- files/patch-instr.h
- files/patch-regs.h

Port maintainer (sbahra at gwu.edu) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- z80-asm-0.1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/z80-asm/Makefile,v
retrieving revision 1.7
diff -u -u -r1.7 Makefile
--- Makefile	2 Oct 2007 05:56:42 -0000	1.7
+++ Makefile	2 Oct 2007 16:52:20 -0000
@@ -21,10 +21,4 @@
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: files/patch-instr.h
===================================================================
RCS file: files/patch-instr.h
diff -N files/patch-instr.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-instr.h	2 Oct 2007 16:57:18 -0000
@@ -0,0 +1,11 @@
+--- instr.h.orig	2007-10-02 18:55:31.000000000 +0200
++++ instr.h	2007-10-02 18:55:46.000000000 +0200
+@@ -3,6 +3,8 @@
+ #ifndef __INSTR_H
+ #define __INSTR_H
+ 
++#include "z80-asm.h"
++
+ #define I_DEFS 71
+ #define I_DEFW 70
+ #define I_DEFB 69
Index: files/patch-regs.h
===================================================================
RCS file: files/patch-regs.h
diff -N files/patch-regs.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-regs.h	2 Oct 2007 16:54:53 -0000
@@ -0,0 +1,11 @@
+--- regs.h.orig	2007-10-02 18:53:19.000000000 +0200
++++ regs.h	2007-10-02 18:53:55.000000000 +0200
+@@ -3,6 +3,8 @@
+ #ifndef __REGS_H
+ #define __REGS_H
+ 
++#include "z80-asm.h"
++
+ #define R_EMPTY 0
+ #define R_A 1
+ #define R_B 2
--- z80-asm-0.1_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: