diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2010-09-15 03:40:25 +0400 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2010-09-15 03:40:25 +0400 |
| commit | 21c2e0c1e9f07d3eac769cf66bfc4dfc0f4b9eb8 (patch) | |
| tree | 0e44f974228e8d3c6c7b2f29b74332029591dbb7 | |
| parent | 9713fa3affb3c898aea0700986ce394cbb9f57b1 (diff) | |
[Core] Revert the SHM patch, the issue was fixed in Mono
| -rw-r--r-- | main/Makefile.include | 1 | ||||
| -rwxr-xr-x | main/build/MacOSX/mdtool | 3 | ||||
| -rwxr-xr-x | main/build/MacOSX/monodevelop | 3 | ||||
| -rw-r--r-- | main/mdtool.in | 3 | ||||
| -rwxr-xr-x | main/monodevelop.in | 3 |
5 files changed, 0 insertions, 13 deletions
diff --git a/main/Makefile.include b/main/Makefile.include index db06a11a67..27b6bd6c9f 100644 --- a/main/Makefile.include +++ b/main/Makefile.include @@ -12,7 +12,6 @@ MD_BIN_PATH=$(abs_top_builddir)/build/bin MD_LAUNCH_SETUP= \ MONODEVELOP_LOCALE_PATH=$(abs_top_builddir)/build/locale \ - MONO_ENABLE_SHM=1 \ MONO_ADDINS_REGISTRY=$(MD_BIN_PATH) MOZILLA_FIVE_HOME=$(MOZILLA_HOME) \ LD_LIBRARY_PATH=`echo "$(LD_LIBRARY_PATH):$(MOZILLA_HOME)" | sed 's/^://g'`d diff --git a/main/build/MacOSX/mdtool b/main/build/MacOSX/mdtool index 95df69f995..4dc8b1428e 100755 --- a/main/build/MacOSX/mdtool +++ b/main/build/MacOSX/mdtool @@ -9,9 +9,6 @@ export DYLD_FALLBACK_LIBRARY_PATH=$MONO_FRAMEWORK_PATH/lib:/lib:/usr/lib #we need lots of file handles ulimit -n 1024 -# MD uses SHM to communicate with the remoted builder processes -export MONO_ENABLE_SHM=1 - #prevent Macports from messing up mono and pkg-config export PATH="$MONO_FRAMEWORK_PATH/bin:$PATH" diff --git a/main/build/MacOSX/monodevelop b/main/build/MacOSX/monodevelop index 7debef3300..0973391493 100755 --- a/main/build/MacOSX/monodevelop +++ b/main/build/MacOSX/monodevelop @@ -9,9 +9,6 @@ export DYLD_FALLBACK_LIBRARY_PATH=$MONO_FRAMEWORK_PATH/lib:/lib:/usr/lib #we need lots of file handles ulimit -n 1024 -# MD uses SHM to communicate with the remoted builder processes -export MONO_ENABLE_SHM=1 - #prevent Macports from messing up mono and pkg-config export PATH="$MONO_FRAMEWORK_PATH/bin:$PATH" diff --git a/main/mdtool.in b/main/mdtool.in index bfe96e42ba..30f44c99e2 100644 --- a/main/mdtool.in +++ b/main/mdtool.in @@ -4,9 +4,6 @@ MONO_EXEC="exec -a mdtool mono" EXE_PATH="${0%%/bin/mdtool}/lib/monodevelop/bin/mdrun.exe" -# MD uses SHM to communicate with the remoted builder processes -export MONO_ENABLE_SHM=1 - ##NOTE: remove this for stable releases if [ -z "$MD_NO_DEBUG" ]; then _MONO_OPTIONS=${MONO_OPTIONS:---debug} diff --git a/main/monodevelop.in b/main/monodevelop.in index 6f294fe1ae..a4dc2cb20e 100755 --- a/main/monodevelop.in +++ b/main/monodevelop.in @@ -4,9 +4,6 @@ MONO_EXEC="exec -a monodevelop mono" EXE_PATH="${0%%/bin/monodevelop}/lib/monodevelop/bin/MonoDevelop.exe" -# MD uses SHM to communicate with the remoted builder processes -export MONO_ENABLE_SHM=1 - _MD_REDIRECT_LOG="${MD_REDIRECT_LOG:-${XDG_CONFIG_HOME:-$HOME/.config}/MonoDevelop/log}" ##NOTE: remove this for stable releases |