# HG changeset patch
# User Mike Miller <mtmiller@octave.org>
# Date 1499529357 25200
# Node ID e9b032b9340a4acc282e45ad2291be12451061ae
# Parent  ca55304a3cfd4062fe9458089c7ffbd89ef7688a
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.

diff -r ca55304a3cfd -r e9b032b9340a src/default-octave.mk
--- 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
diff -r ca55304a3cfd -r e9b032b9340a src/octave.mk
--- 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
diff -r ca55304a3cfd -r e9b032b9340a src/stable-octave.mk
--- 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