pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/octave Unfortunately, octave will not build with ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d0eede314390
branches:  trunk
changeset: 463400:d0eede314390
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Mon Nov 10 01:04:05 2003 +0000

description:
Unfortunately, octave will not build with gcc>=3.0 (and we really do not
want to patch all this), so bail out if we detect a gcc-3 compiler.
Suggest octave-current instead.  Closes my own PR pkg/21874.

While here, allow dependecy on either ghostscript or ghostscript-nox11.

diffstat:

 math/octave/Makefile |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 0b7f3a1ef51a -r d0eede314390 math/octave/Makefile
--- a/math/octave/Makefile      Mon Nov 10 00:20:29 2003 +0000
+++ b/math/octave/Makefile      Mon Nov 10 01:04:05 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/09/28 18:02:16 kristerw Exp $
+# $NetBSD: Makefile,v 1.38 2003/11/10 01:04:05 jschauma Exp $
 # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
 
 DISTNAME=      octave-2.0.17
@@ -15,7 +15,7 @@
 COMMENT=       High-level language, primarily intended for numerical computations
 
 BUILD_DEPENDS+=        teTeX{,2}>=1.0.7:../../print/teTeX
-DEPENDS+=      gnuplot>=3.7:../../graphics/gnuplot
+DEPENDS+=      gnuplot{,-nox11}>=3.7:../../graphics/gnuplot
 
 CONFLICTS+=    octave-2.1.*
 
@@ -52,6 +52,10 @@
 
 GCC_VERSION!=   ${CC} --version
 
+.if empty(${CC_VERSION:Mgcc-3*})
+PKG_FAIL_REASON=       "Octave does not build with ${CC_VERSION} - please use octave-current."
+.endif
+
 post-patch:
 .if ${GCC_VERSION:C/-.*$$//} == egcs
        @EGCS_VERSION=`${CC} -v 2>&1 | ${AWK} '{print $$4}'`; \



Home | Main Index | Thread Index | Old Index