Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: lib by alan from (linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: linux-ha by alan from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: lib by alan from (linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: linux-ha by panjiam from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Wed, 16 Aug 2006 15:55:05 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/clplumbing
Modified Files:
longclock.c
Log Message:
Bug 1407: Added configure option to disable the kludge needed to fix the
problem.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/longclock.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- longclock.c 16 Aug 2006 14:37:08 -0000 1.21
+++ longclock.c 16 Aug 2006 21:55:04 -0000 1.22
@@ -1,4 +1,4 @@
-/* $Id: longclock.c,v 1.21 2006/08/16 14:37:08 alan Exp $ */
+/* $Id: longclock.c,v 1.22 2006/08/16 21:55:04 alan Exp $ */
/*
* Longclock operations
*
@@ -72,8 +72,9 @@
unsigned long
cl_times(void) /* Make times(2) behave rationally on Linux */
{
+ clock_t ret;
+#ifndef DISABLE_TIMES_KLUDGE
int save_errno = errno;
- clock_t ret;
/*
* times(2) really returns an unsigned value ...
@@ -87,8 +88,10 @@
*
*/
errno = 0;
+#endif /* DISABLE_TIMES_KLUDGE */
ret = times(TIMES_PARAM);
+#ifndef DISABLE_TIMES_KLUDGE
/*
* This is to work around a bug in the system call interface
* for times(2) found in glibc on Linux (and maybe elsewhere)
@@ -105,6 +108,7 @@
ret = (clock_t) (-errno);
}
errno = save_errno;
+#endif /* DISABLE_TIMES_KLUDGE */
return (unsigned long)ret;
}
------------------------------
Message: 2
Date: Wed, 16 Aug 2006 15:55:05 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Bug 1407: Added configure option to disable the kludge needed to fix the
problem.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.547
retrieving revision 1.548
diff -u -3 -r1.547 -r1.548
--- configure.in 14 Aug 2006 20:00:55 -0000 1.547
+++ configure.in 16 Aug 2006 21:55:04 -0000 1.548
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.547 $) dnl cvs revision
+AC_REVISION($Revision: 1.548 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -1496,6 +1496,10 @@
[ --enable-fatal-warnings very pedantic and fatal warnings for gcc
[default=yes]],
[], [enable_fatal_warnings=unknown])
+AC_ARG_ENABLE([times-kludge],
+[ --enable-times-kludge enables a kludge to workaround a bug in glibc's
times(2) call
+ [default=yes]],
+ [], [enable_times_kludge=unknown])
AC_ARG_ENABLE([no-long-long],
[ --enable-no-long-long removes no long long warning for gcc
@@ -1777,6 +1781,13 @@
*solaris*)
;;
esac
+ case "$host_os" in
+ *linux*)
+ if test "${enable_times_kludge}" = "unknown"; then
+ enable_times_kludge=yes
+ fi
+ ;;
+ esac
if test "${enable_ansi}" = yes && cc_supports_flag -std=iso9899:199409
; then
echo "Enabling ANSI Compatibility on this platform"
@@ -1797,7 +1808,13 @@
CC_WARNINGS="$EXTRA_WARNINGS $FATAL_WARNINGS $ANSI"
NON_FATAL_CC_WARNINGS="$EXTRA_WARNINGS"
+
+fi
+if test "${enable_times_kludge}" = no; then
+ echo "Disabling times(2) kludge"
+ AC_DEFINE(DISABLE_TIMES_KLUDGE, 1, [disable times(2) kludge])
fi
+AC_SUBST(DISABLE_TIMES_KLUDGE)
AC_MSG_CHECKING(which init (rc) directory to use)
INITDIR=""
@@ -2883,6 +2900,8 @@
AC_MSG_RESULT([ CIM providers dir = "${CMPI_PROVIDER_DIR}"])
AC_MSG_RESULT([ CMPI header files = "${CMPI_HEADER_PATH}"])
fi
+AC_MSG_RESULT([ Enable times kludge = "${enable_times_kludge}"])
+AC_SUBST(DISABLE_TIMES_KLUDGE)
AC_MSG_RESULT([ CC_WARNINGS = "${CC_WARNINGS}"])
AC_MSG_RESULT([ Mangled CFLAGS = "${CFLAGS}"])
------------------------------
Message: 3
Date: Wed, 16 Aug 2006 15:55:05 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/stonith
Modified Files:
expect.c
Log Message:
Bug 1407: Added configure option to disable the kludge needed to fix the
problem.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/stonith/expect.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- expect.c 16 Aug 2006 14:37:08 -0000 1.22
+++ expect.c 16 Aug 2006 21:55:04 -0000 1.23
@@ -1,4 +1,4 @@
-/* $Id: expect.c,v 1.22 2006/08/16 14:37:08 alan Exp $ */
+/* $Id: expect.c,v 1.23 2006/08/16 21:55:04 alan Exp $ */
/*
* Simple expect module for the STONITH library
*
@@ -76,22 +76,28 @@
static unsigned long
our_times(void) /* Make times(2) behave rationally on Linux */
{
+ clock_t ret;
+#ifndef DISABLE_TIMES_KLUDGE
int save_errno;
- clock_t ret;
/*
* This code copied from clplumbing/longclock.c to avoid
* making STONITH depend on clplumbing. See it for an explanation
*/
errno = 0;
+#endif /* DISABLE_TIMES_KLUDGE */
+
ret = times(TIMES_PARAM);
+#ifndef DISABLE_TIMES_KLUDGE
if (errno != 0) {
ret = (clock_t) (-errno);
}
errno = save_errno;
+#endif /* DISABLE_TIMES_KLUDGE */
return (unsigned long)ret;
}
+
/*
* Look for ('expect') any of a series of tokens in the input
* Return the token type for the given token or -1 on error.
------------------------------
Message: 4
Date: Wed, 16 Aug 2006 20:57:45 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
option to disable tipc build
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.548
retrieving revision 1.549
diff -u -3 -r1.548 -r1.549
--- configure.in 16 Aug 2006 21:55:04 -0000 1.548
+++ configure.in 17 Aug 2006 02:57:45 -0000 1.549
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.548 $) dnl cvs revision
+AC_REVISION($Revision: 1.549 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -1133,9 +1133,13 @@
dnl ***************************************************************************
dnl TIPC communication module
dnl ***************************************************************************
+AC_ARG_ENABLE([tipc],
+ [ --enable-tipc Enable TIPC Communication module,
+ [default=try]], [], [enable_tipc=try])
AC_ARG_WITH([tipc],
[ --with-tipc-source TIPC source code directory], [], [])
+
TIPC_DEV_ROOT=${with_tipc_source}
tipc_headers_found=yes
@@ -1151,7 +1155,8 @@
fi
AC_SUBST(TIPC_INCLUDE)
-AM_CONDITIONAL(BUILD_TIPC_MODULE, test "x${tipc_headers_found}" = "xyes")
+AM_CONDITIONAL(BUILD_TIPC_MODULE,
+ test "x${tipc_headers_found}" = "xyes" && test "x${enable_tipc}" !=
"xno")
dnl ***************************************************************************
dnl CIM provider configuration
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 33, Issue 73
********************************************
