Mercurial > mxe-octave
comparison src/octave.mk @ 3369:a77a677643d5
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 | cfcbe03c9160 |
children | d40e120eeb57 |
comparison
equal
deleted
inserted
replaced
3368:f03dfd9bf241 | 3369:a77a677643d5 |
---|---|
18 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit | 18 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit |
19 endif | 19 endif |
20 | 20 |
21 ifeq ($(ENABLE_JAVA),no) | 21 ifeq ($(ENABLE_JAVA),no) |
22 $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := --disable-java | 22 $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := --disable-java |
23 else | |
24 ifeq ($(MXE_SYSTEM),mingw) | |
25 ifeq ($(MXE_NATIVE_BUILD),no) | |
26 $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := \ | |
27 --with-java-homedir="$(HOST_INCDIR)/java" \ | |
28 --with-java-includedir="$(HOST_INCDIR)/java" | |
29 endif | |
30 endif | |
23 endif | 31 endif |
24 | 32 |
25 ifeq ($(ENABLE_DOCS),yes) | 33 ifeq ($(ENABLE_DOCS),yes) |
26 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --enable-docs | 34 $(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS := --enable-docs |
27 endif | 35 endif |
71 echo 'Warning: Updates are temporarily disabled for package octave.' >&2; | 79 echo 'Warning: Updates are temporarily disabled for package octave.' >&2; |
72 echo $(octave_VERSION) | 80 echo $(octave_VERSION) |
73 endef | 81 endef |
74 | 82 |
75 define $(PKG)_BUILD | 83 define $(PKG)_BUILD |
84 | |
85 # jni install | |
86 if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" ]]; then \ | |
87 mkdir -p '$(HOST_INCDIR)/java/include'; \ | |
88 $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \ | |
89 -O $(HOST_INCDIR)/java/include/jni.h; \ | |
90 mkdir -p '$(HOST_INCDIR)/java/include/win32'; \ | |
91 $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \ | |
92 -O $(HOST_INCDIR)/java/include/win32/jni_md.h; \ | |
93 fi | |
94 | |
76 mkdir '$(1)/.build' | 95 mkdir '$(1)/.build' |
77 cd '$(1)' && autoreconf -W none | 96 cd '$(1)' && autoreconf -W none |
78 cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ | 97 cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ |
79 $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ | 98 $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ |
80 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ | 99 $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ |