Mercurial > mxe-octave

changeset 4240:724749afb8b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile.in: check if have version of octave and warn if cant find it (Bug #49503) * Makefile.in: in check-requirements, verify and warn if do not have correct octave
author John D
date Thu, 03 Nov 2016 04:08:08 -0400
parents 016aa52965bb
children e51182874ece
files Makefile.in
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Thu Nov 03 09:35:20 2016 -0700
+++ b/Makefile.in	Thu Nov 03 04:08:08 2016 -0400
@@ -602,6 +602,11 @@
 $(STAMP_DIR)/check-requirements: $(MAKEFILE)
 	@echo '[check requirements]'
 	$(foreach REQUIREMENT,$(REQUIREMENTS),$(call CHECK_REQUIREMENT,$(REQUIREMENT)))
+ifneq ($(MXE_NATIVE_BUILD),yes)
+	@if ! octave --version | head -1 | grep ' \($($(OCTAVE_TARGET)_VERSION)\)$$' >/dev/null; then \
+	  echo "Warning - could not find native build version $($(OCTAVE_TARGET)_VERSION) of octave - some packages may fail, but continuing"; \
+	fi
+endif
 	@[ -d '$(STAMP_DIR)' ] || mkdir -p '$(STAMP_DIR)'
 	@if test "$(USE_SYSTEM_GCC)" = yes; then \
 	  $(INSTALL) -d '$(BUILD_TOOLS_PREFIX)/bin' ; \