changeset 3861:dbc4b45a0f06

octave.mk: handle cross compiling packages
author John W. Eaton <jwe@octave.org>
date Tue, 24 Mar 2015 12:43:39 -0400
parents b36a7ab4bd2c
children c08abc3f5bf3
files src/octave.mk
diffstat 1 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/octave.mk	Tue Mar 24 06:37:36 2015 -0400
+++ b/src/octave.mk	Tue Mar 24 12:43:39 2015 -0400
@@ -88,6 +88,13 @@
   $(PKG)_EXTRA_CONFIGURE_OPTIONS += --with-x=no
 endif
 
+# if want binary packages and are cross compiling, then we need cross tools enabled
+ifeq ($(ENABLE_BINARY_PACKAGES),yes)
+  ifeq ($(MXE_NATIVE_BUILD),no)
+    $(PKG)_EXTRA_CONFIGURE_OPTIONS += --enable-cross-tools
+  endif
+endif
+
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
     echo $($(PKG)_VERSION)
@@ -135,6 +142,11 @@
 
     if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \
       cp '$(1)/.build/src/.libs/octave-gui.exe' '$(3)$(HOST_BINDIR)'; \
+      if [ "x$(ENABLE_BINARY_PACKAGES)" == "xyes" ]; then \
+        mkdir -p '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
+        $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)mkoctfile' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
+        $(INSTALL) '$(1)/.build/src/$(MXE_TOOL_PREFIX)octave-config' '$(3)$(BUILD_TOOLS_PREFIX)/bin'; \
+      fi; \
     fi
 
     if [ "x$(ENABLE_DOCS)" == "xyes" ]; then \