From f63311415c95894de3b0842b03b078607e614729 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Thu, 22 Nov 2007 08:35:23 +0000 Subject: [PATCH] - Fix build with gcc 4.2 PR: 118029 Submitted by: Pietro Cerutti Approved by: portmgr (erwin) --- lang/q/Makefile | 4 ---- lang/q/files/patch-modules-octave_octave.c | 19 +++++++++++++++++++ lang/q/files/patch-src_qmparse.y | 10 ++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 lang/q/files/patch-modules-octave_octave.c create mode 100644 lang/q/files/patch-src_qmparse.y diff --git a/lang/q/Makefile b/lang/q/Makefile index 5505397fa8a2..c5af638ea287 100644 --- a/lang/q/Makefile +++ b/lang/q/Makefile @@ -80,10 +80,6 @@ INFO= qdoc .include -.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 diff --git a/lang/q/files/patch-modules-octave_octave.c b/lang/q/files/patch-modules-octave_octave.c new file mode 100644 index 000000000000..891db66f7685 --- /dev/null +++ b/lang/q/files/patch-modules-octave_octave.c @@ -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 */ diff --git a/lang/q/files/patch-src_qmparse.y b/lang/q/files/patch-src_qmparse.y new file mode 100644 index 000000000000..a07f756d502e --- /dev/null +++ b/lang/q/files/patch-src_qmparse.y @@ -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) {