Mercurial > mxe-octave

comparison src/default-octave.mk @ 4311:8528b1ccd529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
default-octave: fix F77 integer size configuration
author John W. Eaton <jwe@octave.org>
date Wed, 04 Jan 2017 05:47:36 -0500
parents 0db33a326eec
children 07671a76e291
comparison
equal deleted inserted replaced
4310:2c34ec679fb3 4311:8528b1ccd529
79 79
80 ifeq ($(MXE_NATIVE_BUILD),yes) 80 ifeq ($(MXE_NATIVE_BUILD),yes)
81 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) 81 $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
82 ifeq ($(ENABLE_64),yes) 82 ifeq ($(ENABLE_64),yes)
83 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull 83 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull
84 endif 84 else
85 ifeq ($(ENABLE_FORTRAN_INT64),yes) 85 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --disable-64
86 F77_INTEGER_8_FLAG=-fdefault-integer-8
87 endif 86 endif
88 else 87 else
89 ifeq ($(MXE_SYSTEM),mingw) 88 ifeq ($(MXE_SYSTEM),mingw)
90 $(PKG)_CROSS_CONFIG_OPTIONS := \ 89 $(PKG)_CROSS_CONFIG_OPTIONS := \
91 FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \ 90 FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
92 gl_cv_func_gettimeofday_clobber=no 91 gl_cv_func_gettimeofday_clobber=no
93 ifeq ($(ENABLE_64),yes) 92 ifeq ($(ENABLE_64),yes)
94 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull 93 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull
94 else
95 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --disable-64
95 endif 96 endif
96 ifeq ($(ENABLE_FORTRAN_INT64),yes) 97 endif
97 $(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS := F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes ax_blas_integer_size=8 octave_cv_sizeof_fortran_integer=8" 98 endif
98 endif 99
99 endif 100 ifeq ($(ENABLE_FORTRAN_INT64),yes)
101 $(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS := F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes ax_blas_integer_size=8 octave_cv_sizeof_fortran_integer=8
102 else
103 $(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS := ax_blas_f77_func_ok=yes ax_blas_integer_size=4 octave_cv_sizeof_fortran_integer=4
100 endif 104 endif
101 105
102 ifeq ($(MXE_SYSTEM),msvc) 106 ifeq ($(MXE_SYSTEM),msvc)
103 $(PKG)_PREFIX := '$(HOST_PREFIX)/local/$($(PKG)_SUBDIR)' 107 $(PKG)_PREFIX := '$(HOST_PREFIX)/local/$($(PKG)_SUBDIR)'
104 # - Enable atomic refcount (required for QtHandles) 108 # - Enable atomic refcount (required for QtHandles)