Mercurial > mxe-octave

changeset 3256:7fb479d0241c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update build tools for native mingw * src/build-m4.mk: do nothing for native mingw build * Makefile.in: - add bison, m4 as natve mingw, and python as jit build requirements. - remove build-bison as a mingw build dependancy * index.html: Add msys-bison to mingw required packages and mention ghostscript and python.
author John Donoghue <john.donoghue@ieee.org>
date Thu, 26 Sep 2013 21:18:39 -0400
parents 11b9d461c135
children 869f160d71b6
files Makefile.in index.html src/build-m4.mk
diffstat 3 files changed, 27 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Mon Sep 23 15:06:17 2013 -0400
+++ b/Makefile.in	Thu Sep 26 21:18:39 2013 -0400
@@ -132,6 +132,11 @@
   REQUIREMENTS += bsdtar
 endif
 
+# if we want jit (llvm) we need python
+ifeq ($(ENABLE_JIT),yes)
+  REQUIREMENTS += python
+endif
+
 LIBTOOL     := libtool
 LIBTOOLIZE  := libtoolize
 
@@ -146,6 +151,18 @@
   REQUIREMENTS += flex
   BUILD_TOOLS := $(filter-out build-flex, $(BUILD_TOOLS))
 endif
+# Building bison for native mingw creates a bison that doesnt  
+# allow push-pull mode so disable
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+  REQUIREMENTS += bison
+  BUILD_TOOLS := $(filter-out build-bison, $(BUILD_TOOLS))
+endif
+# use the msys m4 in native mingw
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+  REQUIREMENTS += m4
+endif
+
+
 ifeq ($(USE_SYSTEM_GCC),yes)
   BUILD_TOOLS := $(filter-out $(BUILD_COMPILER_TOOLS), $(BUILD_TOOLS))
 endif
--- a/index.html	Mon Sep 23 15:06:17 2013 -0400
+++ b/index.html	Thu Sep 26 21:18:39 2013 -0400
@@ -767,12 +767,15 @@
     <pre>mingw-get upgrade</pre>
     <p>
     And then get required packages.
-    <pre>mingw-get install autoconf bash msys-flex gcc gcc-c++ \
+    <pre>mingw-get install autoconf bash msys-bison msys-flex gcc gcc-c++ \
 	      gcc-fortran gettext msys-m4 msys-make msys-sed \
 	      libiconv msys-openssl msys-patch msys-perl \
               msys-libarchive msys-unzip msys-wget msys-bsdtar
     </pre>
     <p>
+    You will also need to install Windows versions of python  
+    and ghostscript and ensure they are in visisble in the PATH.
+    <p>
 
     <h3 id="requirements-opensuse">openSUSE</h3>
 
--- a/src/build-m4.mk	Mon Sep 23 15:06:17 2013 -0400
+++ b/src/build-m4.mk	Thu Sep 26 21:18:39 2013 -0400
@@ -14,6 +14,11 @@
     echo $($(PKG)_VERSION)
 endef
 
+ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
+define $(PKG)_BUILD
+    echo "Ignoring build-m4  for native mingw build"
+endef
+else
 define $(PKG)_BUILD
     mkdir '$(1).build'
     cd    '$(1).build' && '$(1)/configure' \
@@ -21,3 +26,4 @@
     $(MAKE) -C '$(1).build' -j '$(JOBS)'
     $(MAKE) -C '$(1).build' -j 1 install
 endef
+endif