diff options
| author | bad <bad@pkgsrc.org> | 2014-05-08 20:48:55 +0000 |
|---|---|---|
| committer | bad <bad@pkgsrc.org> | 2014-05-08 20:48:55 +0000 |
| commit | 0047329a69dbe4af779f3d968a8cf1db64a52943 (patch) | |
| tree | ad879d422d1a3563cf8d113fd6e6f4910a149e59 /graphics/gnuplot | |
| parent | 524b31048c2692f7ca7edf00aad59b622a1a88be (diff) | |
| download | pkgsrc-0047329a69dbe4af779f3d968a8cf1db64a52943.tar.gz | |
Configure with --with-wx-single-threaded when using wxwidgets.
Makes wxt terminal usable again on NetBSD. Also required on some Linux
versions with newer Haswell cpus.
PKGREVISION++
Fixes PR pkg/47177.
Diffstat (limited to 'graphics/gnuplot')
| -rw-r--r-- | graphics/gnuplot/Makefile | 4 | ||||
| -rw-r--r-- | graphics/gnuplot/options.mk | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile index 4c5b0c0fba1..9379c026368 100644 --- a/graphics/gnuplot/Makefile +++ b/graphics/gnuplot/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.89 2014/05/05 00:47:57 ryoon Exp $ +# $NetBSD: Makefile,v 1.90 2014/05/08 20:48:55 bad Exp $ DISTNAME= gnuplot-4.6.5 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES+= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/} diff --git a/graphics/gnuplot/options.mk b/graphics/gnuplot/options.mk index ed8a2cff79b..eeea84e1ba4 100644 --- a/graphics/gnuplot/options.mk +++ b/graphics/gnuplot/options.mk @@ -1,11 +1,7 @@ -# $NetBSD: options.mk,v 1.7 2013/05/16 14:17:04 adam Exp $ +# $NetBSD: options.mk,v 1.8 2014/05/08 20:48:55 bad Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnuplot -PKG_SUPPORTED_OPTIONS= gd lua pdf x11 qt4 -.if ${OPSYS} != "NetBSD" -# wxterminal is broken on NetBSD c.f. pkg/47177 -PKG_SUPPORTED_OPTIONS+= wxwidgets -.endif +PKG_SUPPORTED_OPTIONS= gd lua pdf x11 qt4 wxwidgets PKG_SUGGESTED_OPTIONS= gd x11 .include "../../mk/bsd.options.mk" @@ -46,7 +42,9 @@ CONFIGURE_ARGS+= --disable-qt .if !empty(PKG_OPTIONS:Mwxwidgets) USE_LANGUAGES+= c++ -CONFIGURE_ARGS+= --enable-wxwidgets +# force wxt terminal into single threaded mode to avoid crashes +# c.f. http://sourceforge.net/p/gnuplot/mailman/message/31928881/ +CONFIGURE_ARGS+= --enable-wxwidgets --with-wx-single-threaded .include "../../x11/wxGTK28/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-wxwidgets |