Mercurial > mxe-octave

comparison src/octave.mk @ 3527:b111822b0bf0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stable-octave.mk, octave.mk: Set java include dir, not home dir. Reconcile differences.
author John W. Eaton <jwe@octave.org>
date Sun, 16 Feb 2014 21:22:24 -0500
parents 3b5b776331f1
children c21ca79d7980
comparison
equal deleted inserted replaced
3526:60cd6f076a3d 3527:b111822b0bf0
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-includedir="$(HOST_INCDIR)/java"
29 endif 29 endif
30 endif 30 endif
31 endif 31 endif
32 32
33 ifneq ($(ENABLE_DOCS),yes) 33 ifneq ($(ENABLE_DOCS),yes)
75 LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)' 75 LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)'
76 endif 76 endif
77 77
78 define $(PKG)_UPDATE 78 define $(PKG)_UPDATE
79 echo 'Warning: Updates are temporarily disabled for package octave.' >&2; 79 echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
80 echo $(octave_VERSION) 80 echo $($(PKG)_VERSION)
81 endef 81 endef
82 82
83 define $(PKG)_BUILD 83 define $(PKG)_BUILD
84
85 # jni install 84 # jni install
86 if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" && "$(ENABLE_JAVA)" == "yes" ]]; then \ 85 if [ "$(MXE_SYSTEM)" == "mingw" ] \
87 if [ ! -f $(HOST_INCDIR)/java/include/jni.h ]; then \ 86 && [ "$(MXE_NATIVE_BUILD)" == "no" ] \
88 mkdir -p '$(HOST_INCDIR)/java/include'; \ 87 && [ "$(ENABLE_JAVA)" == "yes" ]; then \
88 if [ ! -f $(HOST_INCDIR)/java/jni.h ]; then \
89 mkdir -p '$(HOST_INCDIR)/java'; \
89 $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \ 90 $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h \
90 -O $(HOST_INCDIR)/java/include/jni.h; \ 91 -O $(HOST_INCDIR)/java/jni.h; \
91 fi; \ 92 fi; \
92 if [ ! -f $(HOST_INCDIR)/java/include/win32/jni_md.h ]; then \ 93 if [ ! -f $(HOST_INCDIR)/java/win32/jni_md.h ]; then \
93 mkdir -p '$(HOST_INCDIR)/java/include/win32'; \ 94 mkdir -p '$(HOST_INCDIR)/java/win32'; \
94 $(WGET) -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/windows/javavm/export/jni_md.h \ 95 $(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 -O $(HOST_INCDIR)/java/win32/jni_md.h; \
96 fi; \ 97 fi; \
97 fi 98 fi
98 99
99 mkdir '$(1)/.build' 100 mkdir '$(1)/.build'
100 cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \ 101 cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
130 fi 131 fi
131 132
132 # create a file with latest installed octave rev in it 133 # create a file with latest installed octave rev in it
133 echo "$($(PKG)_VERSION)" > $(TOP_DIR)/octave/octave-version 134 echo "$($(PKG)_VERSION)" > $(TOP_DIR)/octave/octave-version
134 endef 135 endef
135