Mercurial > mxe-octave

diff src/of-windows.mk @ 5531:eae508c12529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add build rule for build-octave (bug #49503). * src/build-octave.mk: Add new build rule for build-octave which can be used for cross-building binary packages that depend on Octave as a build tool. * dist-files.mk: Add new file to list. * index.html: Add new package to list. * src/of-communications.mk, src/of-image.mk, src/of-mapping.mk, src/of-optiminterp.mk, src/of-sparsersb.mk, src/of-statistics.mk, src/of-windows.mk: Add optional dependency on build-octave. * configure.ac: Add new configure switch "--disable-system-octave" that is needed to build the build-octave package. * Makefile.in: Add variable "USE_SYSTEM_OCTAVE". Exclude build-octave from the default build tools and build it only if a package explicitly depends on it. Display warning about missing native Octave version only if necessary.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 08 Sep 2020 23:04:38 +0200
parents e6c840349429
children b03d8ffdbaa2
line wrap: on
line diff
--- a/src/of-windows.mk	Tue Sep 08 16:04:48 2020 +0200
+++ b/src/of-windows.mk	Tue Sep 08 23:04:38 2020 +0200
@@ -5,14 +5,20 @@
 $(PKG)_IGNORE   :=
 $(PKG)_VERSION  := 1.5.0
 $(PKG)_CHECKSUM := c2323df04664626a30d837154f2a7ea3255b9182
-$(PKG)_REMOTE_SUBDIR := 
+$(PKG)_REMOTE_SUBDIR :=
 $(PKG)_SUBDIR   := windows-$($(PKG)_VERSION)
 $(PKG)_FILE     := windows-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
-$(PKG)_DEPS     := 
+$(PKG)_DEPS     :=
 
 ifeq ($(ENABLE_BINARY_PACKAGES),yes)
     $(PKG)_DEPS += $(OCTAVE_TARGET)
+    ifeq ($(MXE_NATIVE_BUILD),no)
+        ifeq ($(USE_SYSTEM_OCTAVE),no)
+            # Remove this when package builds without calling Octave
+            $(PKG)_DEPS += build-octave
+        endif
+    endif
 endif
 
 define $(PKG)_UPDATE