Mercurial > mxe-octave

changeset 4407:e9b032b9340a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
octave: cross-compile gnulib time functions correctly (bug #51351) * default-octave.mk: Define gl_cv_func_tzset_clobber=no to bypass faulty configure test when cross-compiling. * octave.mk: Likewise. * stable-octave.mk: Likewise.
author Mike Miller <mtmiller@octave.org>
date Sat, 08 Jul 2017 08:55:57 -0700
parents ca55304a3cfd
children eb8b37422e16
files src/default-octave.mk src/octave.mk src/stable-octave.mk
diffstat 3 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/default-octave.mk	Mon Jul 03 09:23:08 2017 -0400
+++ b/src/default-octave.mk	Sat Jul 08 08:55:57 2017 -0700
@@ -85,7 +85,8 @@
   ifeq ($(MXE_SYSTEM),mingw)
     $(PKG)_CROSS_CONFIG_OPTIONS := \
       FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
-      gl_cv_func_gettimeofday_clobber=no
+      gl_cv_func_gettimeofday_clobber=no \
+      gl_cv_func_tzset_clobber=no
     ifeq ($(ENABLE_64),yes)
       $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64
     else
--- a/src/octave.mk	Mon Jul 03 09:23:08 2017 -0400
+++ b/src/octave.mk	Sat Jul 08 08:55:57 2017 -0700
@@ -77,7 +77,8 @@
   ifeq ($(MXE_SYSTEM),mingw)
     $(PKG)_CROSS_CONFIG_OPTIONS := \
       FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
-      gl_cv_func_gettimeofday_clobber=no
+      gl_cv_func_gettimeofday_clobber=no \
+      gl_cv_func_tzset_clobber=no
     ifeq ($(ENABLE_64),yes)
       $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes
     endif
--- a/src/stable-octave.mk	Mon Jul 03 09:23:08 2017 -0400
+++ b/src/stable-octave.mk	Sat Jul 08 08:55:57 2017 -0700
@@ -77,7 +77,8 @@
   ifeq ($(MXE_SYSTEM),mingw)
     $(PKG)_CROSS_CONFIG_OPTIONS := \
       FLTK_CONFIG='$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)fltk-config' \
-      gl_cv_func_gettimeofday_clobber=no
+      gl_cv_func_gettimeofday_clobber=no \
+      gl_cv_func_tzset_clobber=no
     ifeq ($(ENABLE_64),yes)
       $(PKG)_ENABLE_64_CONFIGURE_OPTIONS := --enable-64 F77_INTEGER_8_FLAG=-fdefault-integer-8 ax_blas_f77_func_ok=yes
     endif