Bruno Haible <br...@clisp.org> wrote:
> Sorry for the delay.
>
>> I've reworked those patches accordingly,
>> but didn't test on a MacOS X system.
>> Since your name is on them, I'll wait until
>> you acknowledge before pushing.
...
> Sure, fine with me. You can put yourself into the ChangeLog entry, of course.
> I'll retest the MacOS X universal builds in a short while.
Done.
With all the intervening changes, there were far more conflicts
than you'd expect for such small changes.
>From 87fec1f1544655181da3e02d7857ee00c83e0f19 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Wed, 21 Jan 2009 20:26:05 +0100
Subject: [PATCH 1/2] mktime: skip configure test (fail it) for apple universal
builds
* m4/mktime.m4 (AC_FUNC_MKTIME): Require gl_MULTIARCH. In Apple
universal builds, assume that mktime does not work.
* modules/mktime (Depends-on): Add multiarch.
---
ChangeLog | 8 ++++++++
m4/mktime.m4 | 9 ++++++++-
modules/mktime | 2 +-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 168fbc2..07eb24a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-21 Bruno Haible <br...@clisp.org>
+ and Jim Meyering <meyer...@redhat.com>
+
+ mktime: skip configure test (fail it) for apple universal builds
+ * m4/mktime.m4 (AC_FUNC_MKTIME): Require gl_MULTIARCH. In Apple
+ universal builds, assume that mktime does not work.
+ * modules/mktime (Depends-on): Add multiarch.
+
2009-01-21 Eric Blake <e...@byu.net>
multiarch: avoid expand-before-require warning
diff --git a/m4/mktime.m4 b/m4/mktime.m4
index 223b9f1..1e926e8 100644
--- a/m4/mktime.m4
+++ b/m4/mktime.m4
@@ -1,4 +1,4 @@
-# serial 14
+# serial 15
dnl Copyright (C) 2002-2003, 2005-2007, 2009 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -15,6 +15,13 @@ dnl From Jim Meyering.
AC_DEFUN([AC_FUNC_MKTIME],
[AC_CHECK_HEADERS_ONCE([unistd.h])
AC_CHECK_FUNCS_ONCE([alarm])
+AC_REQUIRE([gl_MULTIARCH])
+if test $APPLE_UNIVERSAL_BUILD = 1; then
+ # A universal build on Apple MacOS X platforms.
+ # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode.
+ # But we need a configuration result that is valid in both modes.
+ ac_cv_func_working_mktime=no
+fi
AC_CACHE_CHECK([for working mktime], [ac_cv_func_working_mktime],
[AC_RUN_IFELSE([AC_LANG_SOURCE(
[[/* Test program from Paul Eggert and Tony Leneis. */
diff --git a/modules/mktime b/modules/mktime
index 4846774..7a5165b 100644
--- a/modules/mktime
+++ b/modules/mktime
@@ -6,6 +6,7 @@ lib/mktime.c
m4/mktime.m4
Depends-on:
+multiarch
time_r
configure.ac:
@@ -21,4 +22,3 @@ LGPLv2+
Maintainer:
Paul Eggert, Jim Meyering, glibc
-
--
1.6.1.331.g9c367
>From 2dd9e7b19575192c6b76a36884796ad2aca5ee31 Mon Sep 17 00:00:00 2001
From: Bruno Haible <br...@clisp.org>
Date: Wed, 21 Jan 2009 20:27:39 +0100
Subject: [PATCH 2/2] nanosleep: skip configure test (fail it) for apple
universal builds
* m4/nanosleep.m4 (gl_FUNC_NANOSLEEP): Require gl_MULTIARCH. In Apple
universal builds, assume that nanosleep does not work.
* modules/nanosleep (Depends-on): Add multiarch.
---
ChangeLog | 5 +++++
m4/nanosleep.m4 | 11 ++++++++++-
modules/nanosleep | 1 +
3 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 07eb24a..4dd6650 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
2009-01-21 Bruno Haible <br...@clisp.org>
and Jim Meyering <meyer...@redhat.com>
+ nanosleep: skip configure test (fail it) for apple universal builds
+ * m4/nanosleep.m4 (gl_FUNC_NANOSLEEP): Require gl_MULTIARCH. In Apple
+ universal builds, assume that nanosleep does not work.
+ * modules/nanosleep (Depends-on): Add multiarch.
+
mktime: skip configure test (fail it) for apple universal builds
* m4/mktime.m4 (AC_FUNC_MKTIME): Require gl_MULTIARCH. In Apple
universal builds, assume that mktime does not work.
diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index ba54130..7f08744 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,4 +1,4 @@
-# serial 26
+# serial 27
dnl From Jim Meyering.
dnl Check for the nanosleep function.
@@ -28,6 +28,15 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
[test "$ac_cv_search_nanosleep" = "none required" ||
LIB_NANOSLEEP=$ac_cv_search_nanosleep])
+ AC_REQUIRE([gl_MULTIARCH])
+ if test $APPLE_UNIVERSAL_BUILD = 1; then
+ # A universal build on Apple MacOS X platforms.
+ # The test result would be 'no (mishandles large arguments)' in 64-bit mode
+ # but 'yes' in 32-bit mode. But we need a configuration result that is
+ # valid in both modes.
+ gl_cv_func_nanosleep='no (mishandles large arguments)'
+ fi
+
AC_CACHE_CHECK([for working nanosleep],
[gl_cv_func_nanosleep],
[
diff --git a/modules/nanosleep b/modules/nanosleep
index 61b4527..ef10653 100644
--- a/modules/nanosleep
+++ b/modules/nanosleep
@@ -9,6 +9,7 @@ Depends-on:
clock-time
extensions
gettime
+multiarch
sigaction
stdbool
sys_select
--
1.6.1.331.g9c367
