ports/118029: [patch] lang/q unbreak fix build with GCC 4.2

[Pietro Cerutti]

>Number:         118029
>Category:       ports
>Synopsis:       [patch] lang/q unbreak fix build with GCC 4.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 14 02:20:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 8.0-CURRENT #9: Fri Nov  9 14:50:37 CET 2007
    root at gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034



>Description:


- fixed two "invalid storage class" errors	


>How-To-Repeat:


cd /usr/ports/lang/q && make


>Fix:


--- _q.diff begins here ---
--- Makefile.orig	2007-11-14 02:28:29.000000000 +0100
+++ Makefile	2007-11-14 02:30:53.000000000 +0100
@@ -80,10 +80,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 .if ${ARCH} == "amd64"
 BROKEN=		Does not build on amd64 (shared libraries must be compiled with -fPIC)
 .endif
--- /dev/null	2007-11-14 03:15:30.000000000 +0100
+++ files/patch-modules-octave_octave.c	2007-11-14 03:07:07.000000000 +0100
@@ -0,0 +1,19 @@
+--- modules/octave/octave.c.orig	2007-11-14 03:04:18.000000000 +0100
++++ modules/octave/octave.c	2007-11-14 03:06:27.000000000 +0100
+@@ -126,6 +126,8 @@
+ static const char *octaverc = ".octaverc";
+ static const char *octaverc_bak = ".octaverc.$$$";
+ 
++static int send_octave(char *);
++
+ /* handle SIGINT and SIGTERM */
+ 
+ #if RETSIGTYPE == void
+@@ -272,7 +274,6 @@
+   FILE *fp, *fp2;
+   char buf[bufsz];
+   int bak = 0;
+-  static int send_octave(char *cmd);
+   static int init = 0;
+   if (!octp) {
+     /* get the command from the OCTAVE variable if defined */
--- /dev/null	2007-11-14 03:15:30.000000000 +0100
+++ files/patch-src_qmparse.y	2007-11-14 03:09:24.000000000 +0100
@@ -0,0 +1,10 @@
+--- src/qmparse.y.orig	2007-11-14 03:07:31.000000000 +0100
++++ src/qmparse.y	2007-11-14 03:09:06.000000000 +0100
+@@ -239,7 +239,6 @@
+ 
+ | _PROMPT_ arg_list
+ {
+-  static savepos();
+   char **argv = $2.v;
+   int argc = $2.c, i;
+   if (argc == 0) {
--- _q.diff ends here ---



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