tech-pkg archive

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

(re-)enabling gnuplot wxwidgets terminal by default



Gnuplot recently introduced a configure switch to disable multithreaded mode
in the wxwidgets (wxt) terminal.  Enabling that switch fixes pthread related
crashes because gnuplot does not run the wxt gui main loop in the main thread
as is required by wxGTK.  This kinda used to work on Linux but has started
failing with Haswell CPUs as well, c.f.
http://sourceforge.net/p/gnuplot/mailman/message/31928881/

I'd like to change gnuplot/options.mk as below.  While there I also want to
enable "wxwidgets" by default because "wxt" is the preferred terminal type
these days.

Objections?

Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/gnuplot/options.mk,v
retrieving revision 1.7
diff -u -r1.7 options.mk
--- options.mk  16 May 2013 14:17:04 -0000      1.7
+++ options.mk  4 May 2014 14:21:44 -0000
@@ -1,12 +1,8 @@
 # $NetBSD: options.mk,v 1.7 2013/05/16 14:17:04 adam 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_SUGGESTED_OPTIONS= gd x11
+PKG_SUPPORTED_OPTIONS= gd lua pdf x11 qt4 wxwidgets
+PKG_SUGGESTED_OPTIONS= gd x11 wxwidgets
 
 .include "../../mk/bsd.options.mk"
 
@@ -46,7 +42,9 @@
 
 .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

--chris


Home | Main Index | Thread Index | Old Index