changeset 3198:1f06b6385e27

Renamed Octave patches according to 'PACKAGE-PATCHNUMBER-DESCRIPTION.patch' format
author Anirudha Bose <ani07nov@gmail.com>
date Thu, 01 Aug 2013 15:21:28 +0530
parents 60483734915e
children f1408becd859
files src/octave-1-fixes.patch src/octave-1-mingw-export-symbols.patch src/octave-2-fixes.patch src/octave-2-no-jvm-check.patch
diffstat 3 files changed, 18 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
rename from src/octave-1-fixes.patch
rename to src/octave-1-mingw-export-symbols.patch
deleted file mode 100644
--- a/src/octave-2-fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -r bb713af2e1d9 configure.ac
---- a/configure.ac	Tue Jul 30 00:49:37 2013 -0400
-+++ b/configure.ac	Thu Aug 01 02:57:25 2013 +0530
-@@ -2441,9 +2441,6 @@
-     darwin*)
-       jvmlib=libjvm.dylib
-     ;;
--    mingw* | cygwin*)
--      jvmlib=jvm.dll
--    ;;
-     *)
-       jvmlib=libjvm.so
-     ;;
new file mode 100644
--- /dev/null
+++ b/src/octave-2-no-jvm-check.patch
@@ -0,0 +1,18 @@
+This file is part of MXE.
+See index.html for further information.
+
+Contains patch to remove checking for jvm.dll during integration of Java support in Octave
+
+diff -r bb713af2e1d9 configure.ac
+--- a/configure.ac	Tue Jul 30 00:49:37 2013 -0400
++++ b/configure.ac	Thu Aug 01 02:57:25 2013 +0530
+@@ -2441,9 +2441,6 @@
+     darwin*)
+       jvmlib=libjvm.dylib
+     ;;
+-    mingw* | cygwin*)
+-      jvmlib=jvm.dll
+-    ;;
+     *)
+       jvmlib=libjvm.so
+     ;;