[smuxi] Server, Frontend-GNOME: added MONO_ENV_OPTIONS support



commit 898ed086f7c970ffa581c46b3472801194729123
Author: Mirco Bauer <meebey meebey net>
Date:   Sat Jun 6 18:13:57 2015 +0200

    Server, Frontend-GNOME: added MONO_ENV_OPTIONS support

 src/Frontend-GNOME/smuxi-frontend-gnome.in |    3 ++-
 src/Server/smuxi-server.in                 |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/Frontend-GNOME/smuxi-frontend-gnome.in b/src/Frontend-GNOME/smuxi-frontend-gnome.in
index 2c16c35..8364fb3 100644
--- a/src/Frontend-GNOME/smuxi-frontend-gnome.in
+++ b/src/Frontend-GNOME/smuxi-frontend-gnome.in
@@ -8,7 +8,8 @@ export MONO_TLS_SESSION_CACHE_TIMEOUT
 # HACK: forcibly disabled SGen, as it has a known SEGV bug related to the
 # Mono.Data.Sqlite binding that does not happen with the boehm GC, see:
 # https://smuxi.im/issues/show/1062
-MONO_ENV_OPTIONS=--gc=boehm
+MONO_ENV_OPTIONS="$(echo $MONO_ENV_OPTIONS | sed s/--gc=sgen//)"
+MONO_ENV_OPTIONS="--gc=boehm $MONO_ENV_OPTIONS"
 export MONO_ENV_OPTIONS
 
 exec mono --debug "@expanded_libdir@/@PACKAGE@/smuxi-frontend-gnome.exe" "$@"
diff --git a/src/Server/smuxi-server.in b/src/Server/smuxi-server.in
index fbc7b5b..adb1f17 100644
--- a/src/Server/smuxi-server.in
+++ b/src/Server/smuxi-server.in
@@ -8,7 +8,8 @@ export MONO_TLS_SESSION_CACHE_TIMEOUT
 # HACK: forcibly disabled SGen, as it has a known SEGV bug related to the
 # Mono.Data.Sqlite binding that does not happen with the boehm GC, see:
 # https://smuxi.im/issues/show/1062
-MONO_ENV_OPTIONS=--gc=boehm
+MONO_ENV_OPTIONS="$(echo $MONO_ENV_OPTIONS | sed s/--gc=sgen//)"
+MONO_ENV_OPTIONS="--gc=boehm $MONO_ENV_OPTIONS"
 export MONO_ENV_OPTIONS
 
 exec mono --debug "@expanded_libdir@/@PACKAGE@/smuxi-server.exe" "$@"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]