Mercurial > mxe-octave

comparison src/default-octave.mk @ 4304:0db33a326eec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make --enable-64 the default new configure option --enable-fortran-int64
author John W. Eaton <jwe@octave.org>
date Fri, 30 Dec 2016 16:02:18 -0500
parents 2b9f1923dc21
children 8528b1ccd529
comparison
equal deleted inserted replaced
4303:eac52a8a7822 4304:0db33a326eec
78 endif 78 endif
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 F77_INTEGER_8_FLAG=-fdefault-integer-8 83 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull
84 endif
85 ifeq ($(ENABLE_FORTRAN_INT64),yes)
86 F77_INTEGER_8_FLAG=-fdefault-integer-8
84 endif 87 endif
85 else 88 else
86 ifeq ($(MXE_SYSTEM),mingw) 89 ifeq ($(MXE_SYSTEM),mingw)
87 $(PKG)_CROSS_CONFIG_OPTIONS := \ 90 $(PKG)_CROSS_CONFIG_OPTIONS := \
88 FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \ 91 FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
89 gl_cv_func_gettimeofday_clobber=no 92 gl_cv_func_gettimeofday_clobber=no
90 ifeq ($(ENABLE_64),yes) 93 ifeq ($(ENABLE_64),yes)
91 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes 94 $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 --without-qhull
95 endif
96 ifeq ($(ENABLE_FORTRAN_INT64),yes)
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"
92 endif 98 endif
93 endif 99 endif
94 endif 100 endif
95 101
96 ifeq ($(MXE_SYSTEM),msvc) 102 ifeq ($(MXE_SYSTEM),msvc)
155 --prefix='$($(PKG)_PREFIX)' \ 161 --prefix='$($(PKG)_PREFIX)' \
156 --disable-silent-rules \ 162 --disable-silent-rules \
157 --enable-install-build-logs \ 163 --enable-install-build-logs \
158 $($(PKG)_CROSS_CONFIG_OPTIONS) \ 164 $($(PKG)_CROSS_CONFIG_OPTIONS) \
159 $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \ 165 $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \
166 $($(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS) \
160 $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \ 167 $($(PKG)_ENABLE_JAVA_CONFIGURE_OPTIONS) \
161 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \ 168 $($(PKG)_ENABLE_JIT_CONFIGURE_OPTIONS) \
162 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \ 169 $($(PKG)_ENABLE_DOCS_CONFIGURE_OPTIONS) \
163 $($(PKG)_QT_CONFIGURE_OPTIONS) \ 170 $($(PKG)_QT_CONFIGURE_OPTIONS) \
164 $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \ 171 $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \