Mercurial > mxe-octave

changeset 3029:2849bea3711f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disable building flex for native mingw
author John W. Eaton <jwe@octave.org>
date Sat, 08 Jun 2013 19:00:32 -0400
parents d024ce7bdaf0
children 0d67b4c363cd
files Makefile src/build-flex.mk
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sat Jun 08 18:52:03 2013 -0400
+++ b/Makefile	Sat Jun 08 19:00:32 2013 -0400
@@ -103,6 +103,10 @@
 LIBTOOL     := libtool
 LIBTOOLIZE  := libtoolize
 BUILD_TOOLS := $(patsubst src/%.mk, %, $(wildcard src/build-*.mk))
+# Building flex for native mingw fails, so disable it.
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+  BUILD_TOOLS := $(filter-out build-flex, $(BUILD_TOOLS))
+endif
 
 STAMP_DIR  := $(PWD)/installed-packages
 MSYS_INFO_DIR := $(PWD)/msys-info
--- a/src/build-flex.mk	Sat Jun 08 18:52:03 2013 -0400
+++ b/src/build-flex.mk	Sat Jun 08 19:00:32 2013 -0400
@@ -16,8 +16,9 @@
 
 define $(PKG)_BUILD
     mkdir '$(1).build'
-    cd    '$(1).build' && '$(1)/configure' \
+    cd    '$(1).build' && /bin/sh -xv '$(1)/configure' \
         --prefix='$(BUILD_TOOLS_PREFIX)'
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
+    exit 1
 endef