Mercurial > mxe-octave

comparison src/stable-octave.mk @ 3516:3b5b776331f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Only download java .h files if not already available * src/stable-octave.mk, src/octave.mk: download java .h files if not already available. Dont set both java home dir and include dir.
author John Donoghue <john.donoghue@ieee.org>
date Sun, 16 Feb 2014 07:21:51 -0500
parents 0b21a39bc9d4
children de728273f855
comparison
equal deleted inserted replaced
3515:a551b373abc4 3516:3b5b776331f1
23 $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := --disable-java 23 $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := --disable-java
24 else 24 else
25 ifeq ($(MXE_SYSTEM),mingw) 25 ifeq ($(MXE_SYSTEM),mingw)
26 ifeq ($(MXE_NATIVE_BUILD),no) 26 ifeq ($(MXE_NATIVE_BUILD),no)
27 $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := \ 27 $(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS := \
28 --with-java-homedir="$(HOST_INCDIR)/java" \ 28 --with-java-homedir="$(HOST_INCDIR)/java"
29 --with-java-includedir="$(HOST_INCDIR)/java"
30 endif 29 endif
31 endif 30 endif
32 endif 31 endif
33 32
34 ifneq ($(ENABLE_DOCS),yes) 33 ifneq ($(ENABLE_DOCS),yes)
83 endef 82 endef
84 83
85 define $(PKG)_BUILD 84 define $(PKG)_BUILD
86 # jni install 85 # jni install
87 if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" && "$(ENABLE_JAVA)" == "yes" ]]; then \ 86 if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" && "$(ENABLE_JAVA)" == "yes" ]]; then \
88 mkdir -p '$(HOST_INCDIR)/java/include'; \ 87 if [ ! -f $(HOST_INCDIR)/java/include/jni.h ]; then \
89 $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \ 88 mkdir -p '$(HOST_INCDIR)/java/include'; \
90 -O $(HOST_INCDIR)/java/include/jni.h; \ 89 $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \
91 mkdir -p '$(HOST_INCDIR)/java/include/win32'; \ 90 -O $(HOST_INCDIR)/java/include/jni.h; \
92 $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \ 91 fi; \
93 -O $(HOST_INCDIR)/java/include/win32/jni_md.h; \ 92 if [ ! -f $(HOST_INCDIR)/java/include/win32/jni_md.h ]; then \
93 mkdir -p '$(HOST_INCDIR)/java/include/win32'; \
94 $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \
95 -O $(HOST_INCDIR)/java/include/win32/jni_md.h; \
96 fi; \
94 fi 97 fi
95 98
96 mkdir '$(1)/.build' 99 mkdir '$(1)/.build'
97 cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ 100 cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
98 $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ 101 $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \