Mercurial > mxe-octave

changeset 3498:0b21a39bc9d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pass F77_INTEGER_8_FLAG=... for Octave configure script if --enable-64
author John W. Eaton <jwe@octave.org>
date Mon, 03 Feb 2014 18:21:55 -0500
parents ddaf87b79532
children 2ad8e2edbab4
files src/octave.mk src/stable-octave.mk
diffstat 2 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/octave.mk	Mon Feb 03 18:20:29 2014 -0500
+++ b/src/octave.mk	Mon Feb 03 18:21:55 2014 -0500
@@ -45,7 +45,7 @@
 ifeq ($(MXE_NATIVE_BUILD),yes)
   $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
   ifeq ($(ENABLE_64),yes)
-    $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64
+    $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8
   endif
 else
   ifeq ($(MXE_SYSTEM),mingw)
@@ -53,7 +53,7 @@
       FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
       gl_cv_func_gettimeofday_clobber=no
     ifeq ($(ENABLE_64),yes)
-      $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 ax_blas_f77_func_ok=yes
+      $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes
     endif
   endif
 endif
--- a/src/stable-octave.mk	Mon Feb 03 18:20:29 2014 -0500
+++ b/src/stable-octave.mk	Mon Feb 03 18:21:55 2014 -0500
@@ -45,7 +45,7 @@
 ifeq ($(MXE_NATIVE_BUILD),yes)
   $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
   ifeq ($(ENABLE_64),yes)
-    $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64
+    $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8
   endif
 else
   ifeq ($(MXE_SYSTEM),mingw)
@@ -53,7 +53,7 @@
       FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
       gl_cv_func_gettimeofday_clobber=no
     ifeq ($(ENABLE_64),yes)
-      $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 ax_blas_f77_func_ok=yes
+      $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes
     endif
   endif
 endif
@@ -128,5 +128,4 @@
 
     # create a file with latest installed octave rev in it
     echo "$($(PKG)_VERSION)" > $(TOP_DIR)/octave/octave-version
-
 endef