ports/115647: Unbreak Hermes for gcc 4.x

[Oliver Brandmueller]

>Number:         115647
>Category:       ports
>Synopsis:       Unbreak Hermes for gcc 4.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 20 14:30:07 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Brandmueller
>Release:        7.0-CURRENT
>Organization:
>Environment:
FreeBSD silver.InterDotNet.DE 7.0-CURRENT FreeBSD 7.0-CURRENT #10: Mon Aug 20 13:19:00 CEST 2007     root at silver.InterDotNet.DE:/usr/obj/usr/src/sys/SILVER  i386

>Description:
Hermes does not compile out of the ports with gcc 4.x
>How-To-Repeat:
cd /usr/ports/graphics/Hermes && make
on a FreeBSD 7-CURRENT with gcc 4.x
>Fix:
Add the following patches to the files dir as patch-ab and patch-ac and unbreak for FreeBSD 7 i386 case:

patch-ab:

--- src/HeadMMX.h.orig  2007-08-20 16:14:17.000000000 +0200
+++ src/HeadMMX.h       2007-08-20 16:15:24.000000000 +0200
@@ -51,7 +51,7 @@
 
 /* Fix the underscore business with ELF compilers */
 
-#if defined(__ELF__) && defined(__GNUC__)
+#if defined(__ELF__) && __GNUC__ < 4
   #ifdef __cplusplus 
   extern "C" {   
   #endif



patch-ac:

--- src/HeadX86.h.orig  2007-08-20 16:14:30.000000000 +0200
+++ src/HeadX86.h       2007-08-20 16:15:43.000000000 +0200
@@ -83,7 +83,7 @@
 
 /* Now fix up the ELF underscore problem */
 
-#if defined(__ELF__) && defined(__GNUC__)
+#if defined(__ELF__) && __GNUC__ < 4
   #ifdef __cplusplus
   extern "C" {
   #endif


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