From c5afd3d39feba1b0958c4befb9dd3627c5ea318a Mon Sep 17 00:00:00 2001 From: Alexander Ljungberg Date: Mon, 23 Apr 2012 23:45:29 +0100 Subject: [PATCH] Fixes #1512. Patch to improve rhino-narwhal platform support. This rhino-narwhal patch can be applied to add JAVA_OPTS support when running Cappuccino utilities through rhino. This generally improves configurability for special cases, and specifically enables a work around for the "failed to map segment from shared object" error on some platforms. --- External/rhino-narwhal-java-opts.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 External/rhino-narwhal-java-opts.patch diff --git a/External/rhino-narwhal-java-opts.patch b/External/rhino-narwhal-java-opts.patch new file mode 100644 index 000000000..687f92631 --- /dev/null +++ b/External/rhino-narwhal-java-opts.patch @@ -0,0 +1,12 @@ +diff -rupN a/engines/rhino/bin/narwhal-rhino b/engines/rhino/bin/narwhal-rhino +--- a/engines/rhino/bin/narwhal-rhino 2011-11-16 11:01:40.000000000 +0000 ++++ b/engines/rhino/bin/narwhal-rhino 2012-04-23 18:35:45.000000000 +0100 +@@ -22,7 +22,7 @@ fi + CLASSPATH=$NARWHAL_ENGINE_HOME/jars/jna.jar + BOOTCLASSPATH=$NARWHAL_ENGINE_HOME/jars/js.jar + +-JAVA_OPTS="-Dnarwhal.http_proxy=$http_proxy" ++JAVA_OPTS="-Dnarwhal.http_proxy=$http_proxy $JAVA_OPTS" + + if [ -n "$NARWHAL_CLASSPATH" ]; then + CLASSPATH=$NARWHAL_CLASSPATH:$CLASSPATH