Mercurial > mxe-octave

changeset 3369:a77a677643d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Install and use jit header files in cross mingw build. * src/octave.mk: in cross mingw, if java is enabled, install win32 jit include files
author John Donoghue <john.donoghue@ieee.org>
date Sat, 14 Dec 2013 08:12:12 -0500
parents f03dfd9bf241
children 920b1cd9c5ce
files src/octave.mk
diffstat 1 files changed, 19 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/octave.mk	Thu Dec 12 18:02:27 2013 -0500
+++ b/src/octave.mk	Sat Dec 14 08:12:12 2013 -0500
@@ -20,6 +20,14 @@
 
 ifeq ($(ENABLE_JAVA),no)
   $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := --disable-java
+else
+  ifeq ($(MXE_SYSTEM),mingw)
+    ifeq ($(MXE_NATIVE_BUILD),no)
+      $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := \
+	--with-java-homedir="$(HOST_INCDIR)/java" \
+    	--with-java-includedir="$(HOST_INCDIR)/java"
+     endif
+  endif
 endif
 
 ifeq ($(ENABLE_DOCS),yes)
@@ -73,6 +81,17 @@
 endef
 
 define $(PKG)_BUILD
+
+    # jni install
+    if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" ]]; then \
+      mkdir -p '$(HOST_INCDIR)/java/include'; \
+      $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \
+        -O $(HOST_INCDIR)/java/include/jni.h; \
+      mkdir -p '$(HOST_INCDIR)/java/include/win32'; \
+      $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \
+        -O $(HOST_INCDIR)/java/include/win32/jni_md.h; \
+    fi
+
     mkdir '$(1)/.build'
     cd '$(1)' && autoreconf -W none
     cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \