Mercurial > mxe-octave

comparison src/stable-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 de728273f855
children f285f1a665d4
comparison
equal deleted inserted replaced
3526:60cd6f076a3d 3527:b111822b0bf0
9 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz 9 $(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz
10 $(PKG)_URL := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE) 10 $(PKG)_URL := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE)
11 ifeq ($(USE_SYSTEM_FONTCONFIG),no) 11 ifeq ($(USE_SYSTEM_FONTCONFIG),no)
12 $(PKG)_FONTCONFIG := fontconfig 12 $(PKG)_FONTCONFIG := fontconfig
13 endif 13 endif
14 $(PKG)_DEPS := arpack curl fftw fltk $($(PKG)_FONTCONFIG) gl2ps glpk graphicsmagick hdf5 lapack pcre pstoedit qhull qrupdate qscintilla qt readline suitesparse texinfo zlib 14 $(PKG)_DEPS := arpack curl fftw fltk $($(PKG)_FONTCONFIG) gl2ps glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qhull qrupdate qscintilla qt readline suitesparse texinfo zlib
15 ifeq ($(ENABLE_JIT),yes) 15 ifeq ($(ENABLE_JIT),yes)
16 $(PKG)_DEPS += llvm 16 $(PKG)_DEPS += llvm
17 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit 17 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --enable-jit
18 else 18 else
19 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit 19 $(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS := --disable-jit
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)
73 $(PKG)_PREFIX := '$(HOST_PREFIX)' 73 $(PKG)_PREFIX := '$(HOST_PREFIX)'
74 $(PKG)_EXTRA_CONFIGURE_OPTIONS := \ 74 $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
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
79 define $(PKG)_UPDATE 78 define $(PKG)_UPDATE
80 echo 'Warning: Updates are temporarily disabled for package octave.' >&2; 79 echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
81 echo $($(PKG)_VERSION) 80 echo $($(PKG)_VERSION)
82 endef 81 endef
83 82
84 define $(PKG)_BUILD 83 define $(PKG)_BUILD
85 # jni install 84 # jni install
86 if [[ "$(MXE_SYSTEM)" == "mingw" && "$(MXE_NATIVE_BUILD)" == "no" && "$(ENABLE_JAVA)" == "yes" ]]; then \ 85 if [ "$(MXE_SYSTEM)" == "mingw" ] \
86 && [ "$(MXE_NATIVE_BUILD)" == "no" ] \
87 && [ "$(ENABLE_JAVA)" == "yes" ]; then \
87 if [ ! -f $(HOST_INCDIR)/java/jni.h ]; then \ 88 if [ ! -f $(HOST_INCDIR)/java/jni.h ]; then \
88 mkdir -p '$(HOST_INCDIR)/java'; \ 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/jni.h; \ 91 -O $(HOST_INCDIR)/java/jni.h; \
91 fi; \ 92 fi; \
92 if [ ! -f $(HOST_INCDIR)/java/win32/jni_md.h ]; then \ 93 if [ ! -f $(HOST_INCDIR)/java/win32/jni_md.h ]; then \
93 mkdir -p '$(HOST_INCDIR)/java/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/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' \