Mercurial > hg > mxe-octave-anirudha

changeset 3204:210ba2447fed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
src/octave.mk: Disable downloading of JNI headers for all systems except MinGW cross
author Anirudha Bose <ani07nov@gmail.com>
date Mon, 16 Sep 2013 03:26:05 +0530
parents 7159c6416eb2
children bde83df3175d
files src/octave.mk
diffstat 1 files changed, 9 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/src/octave.mk
+++ b/src/octave.mk
@@ -32,12 +32,7 @@
     $(PKG)_CROSS_CONFIG_OPTIONS := \
       FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
       gl_cv_func_gettimeofday_clobber=no
-    define MINGW_JAVA_CONFIG =
-      mkdir -p '$(HOST_PREFIX)/include/java/include'
-      wget -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h -O $(HOST_PREFIX)/include/java/include/jni.h
-      mkdir -p '$(HOST_PREFIX)/include/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_PREFIX)/include/java/include/win32/jni_md.h
-    endef
+
     $MINGW_JAVA_CONFIG_OPTIONS := \
       --with-java-homedir="$(HOST_PREFIX)/include/java" \
       --with-java-includedir="$(HOST_PREFIX)/include/java" \
@@ -68,35 +63,16 @@
     echo $(octave_VERSION)
 endef
 
-ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
 define $(PKG)_BUILD
-    mkdir '$(1)/.build'
-    cd '$(1)' && autoreconf -W none
-    cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
-        $(CONFIGURE_CPPFLAGS) \
-        $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
-        --prefix='$($(PKG)_PREFIX)' \
-	--enable-docs \
-        $($(PKG)_BLAS_OPTION) \
-	$($(PKG)_CROSS_CONFIG_OPTIONS) \
-        $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \
-        $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \
-	$($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
-	PKG_CONFIG='$(MXE_PKG_CONFIG)' \
-	PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \
-        && $($(PKG)_CONFIGURE_POST_HOOK)
-
-    ## We want both of these install steps so that we install in the
-    ## location set by the configure --prefix option, and the other
-    ## in a directory tree that will have just Octave files.
-    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install install-pdf install-html
-    if [ $(MXE_SYSTEM) != msvc ]; then \
-        $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_DIR)/octave install; \
+    if [[ "$(MXE_NATIVE_MINGW_BUILD)" != yes && "$(MXE_SYSTEM)" == mingw ]]; then \
+        mkdir '$(1)/.build' ; \
+	mkdir -p '$(HOST_PREFIX)/include/java/include' ; \
+	wget -N http://hg.openjdk.java.net/jdk7u/jdk7u/jdk/raw-file/tip/src/share/javavm/export/jni.h -O $(HOST_PREFIX)/include/java/include/jni.h ; \
+	mkdir -p '$(HOST_PREFIX)/include/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_PREFIX)/include/java/include/win32/jni_md.h; \
+    else \
+	mkdir '$(1)/.build' ; \
     fi
-endef
-else
-define $(PKG)_BUILD
-    mkdir '$(1)/.build' && $(MINGW_JAVA_CONFIG)
     cd '$(1)' && autoreconf -W none
     cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) \
@@ -121,4 +97,3 @@
         $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_DIR)/octave install; \
     fi
 endef
-endif