From ec21f0494ef8fe8ca9ab1891560b0b331b98dd4a Mon Sep 17 00:00:00 2001 From: orbiter Date: Sat, 18 Jan 2014 12:54:14 +0100 Subject: [PATCH] removed -d64 jvm option because that causes problems on non-64 bit linux, see http://bugs.yacy.net/view.php?id=349 and http://bugs.yacy.net/view.php?id=339 --- addon/YaCy.app/Contents/Info.plist | 2 +- addon/yacyInit.m4 | 2 +- startYACY.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addon/YaCy.app/Contents/Info.plist b/addon/YaCy.app/Contents/Info.plist index 0f0220333..c0ab76fdd 100644 --- a/addon/YaCy.app/Contents/Info.plist +++ b/addon/YaCy.app/Contents/Info.plist @@ -25,7 +25,7 @@ Java VMOptions - -server -d64 -Xmx600m -Xms90m -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8 -Dsolr.directoryFactory=solr.MMapDirectoryFactory + -server -Xmx600m -Xms90m -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF-8 -Dsolr.directoryFactory=solr.MMapDirectoryFactory WorkingDirectory $APP_PACKAGE/Contents/Resources/Java MainClass diff --git a/addon/yacyInit.m4 b/addon/yacyInit.m4 index dcfc39ff3..333028cd2 100644 --- a/addon/yacyInit.m4 +++ b/addon/yacyInit.m4 @@ -57,7 +57,7 @@ SHUTDOWN_TIMEOUT=50 # Default niceness if not set in config file NICE_VAL=0 -JAVA_ARGS="-server -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dfile.encoding=UTF-8 -d64 -Dsolr.directoryFactory=solr.MMapDirectoryFactory" +JAVA_ARGS="-server -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Dfile.encoding=UTF-8 -Dsolr.directoryFactory=solr.MMapDirectoryFactory" ifdef(`openSUSE', `dnl . /etc/rc.status diff --git a/startYACY.sh b/startYACY.sh index ef59f49bf..eb4ed4dc5 100755 --- a/startYACY.sh +++ b/startYACY.sh @@ -133,7 +133,7 @@ then fi #turn on MMap for Solr if OS is a 64bit OS -if [ -n "`uname -m | grep 64`" ]; then JAVA_ARGS="$JAVA_ARGS -d64 -Dsolr.directoryFactory=solr.MMapDirectoryFactory"; fi +if [ -n "`uname -m | grep 64`" ]; then JAVA_ARGS="$JAVA_ARGS -Dsolr.directoryFactory=solr.MMapDirectoryFactory"; fi if [ ! -f $CONFIGFILE -a -f DATA/SETTINGS/httpProxy.conf ] then