From f1564793068446179f97f35698c6cf33058fca1d Mon Sep 17 00:00:00 2001 From: "Vladimir.Marek" Date: Fri, 16 Aug 2013 16:38:15 +0200 Subject: [PATCH] [PATCH 2/4] asctime: check for standards compliance (Solaris support) --- 59/5e2ba2748b72af689fa6fd73350ccc877f2291 | 166 ++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 59/5e2ba2748b72af689fa6fd73350ccc877f2291 diff --git a/59/5e2ba2748b72af689fa6fd73350ccc877f2291 b/59/5e2ba2748b72af689fa6fd73350ccc877f2291 new file mode 100644 index 000000000..a1a3e1a33 --- /dev/null +++ b/59/5e2ba2748b72af689fa6fd73350ccc877f2291 @@ -0,0 +1,166 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id E6F98429E2E + for ; Fri, 16 Aug 2013 07:38:48 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -2.299 +X-Spam-Level: +X-Spam-Status: No, score=-2.299 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_MED=-2.3, UNPARSEABLE_RELAY=0.001] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 90JbGBETDi-3 for ; + Fri, 16 Aug 2013 07:38:43 -0700 (PDT) +Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id EE49D431E82 + for ; Fri, 16 Aug 2013 07:38:42 -0700 (PDT) +Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) + by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with + ESMTP id r7GEceCg019364 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); + Fri, 16 Aug 2013 14:38:40 GMT +Received: from userz7021.oracle.com (userz7021.oracle.com [156.151.31.85]) + by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id + r7GEcdj6024145 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); + Fri, 16 Aug 2013 14:38:39 GMT +Received: from abhmt119.oracle.com (abhmt119.oracle.com [141.146.116.71]) + by userz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id + r7GEcdhN025098; Fri, 16 Aug 2013 14:38:39 GMT +Received: from tbd.cz.oracle.com (/10.163.101.124) + by default (Oracle Beehive Gateway v4.0) + with ESMTP ; Fri, 16 Aug 2013 07:38:38 -0700 +From: Vladimir.Marek@oracle.com +To: notmuch@notmuchmail.org +Subject: [PATCH 2/4] asctime: check for standards compliance (Solaris support) +Date: Fri, 16 Aug 2013 16:38:15 +0200 +Message-Id: <1376663897-24385-3-git-send-email-Vladimir.Marek@oracle.com> +X-Mailer: git-send-email 1.7.9.2 +In-Reply-To: <1376663897-24385-1-git-send-email-Vladimir.Marek@oracle.com> +References: <1376663897-24385-1-git-send-email-Vladimir.Marek@oracle.com> +X-Source-IP: ucsinet22.oracle.com [156.151.31.94] +Cc: Vladimir Marek +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 16 Aug 2013 14:38:49 -0000 + +From: Vladimir Marek + +Add checks to "configure" to see whether _POSIX_PTHREAD_SEMANTICS needs +to be defined to get the right number of arguments in the prototypes for +asctime_r(). Solaris' default implementation conforms to POSIX.1c +Draft 6, rather than the final POSIX.1c spec. The standards-compliant +version can be used by defining _POSIX_PTHREAD_SEMANTICS. + +This change also adds the file "compat/check_asctime.c", which +configure uses to perform its check, and modifies compat/compat.h to +define _POSIX_PTHREAD_SEMANTICS if configure detected it was needed. + +Signed-off-by: Vladimir Marek +--- + compat/check_asctime.c | 11 +++++++++++ + compat/compat.h | 3 +++ + configure | 22 ++++++++++++++++++++-- + 3 files changed, 34 insertions(+), 2 deletions(-) + create mode 100644 compat/check_asctime.c + +diff --git a/compat/check_asctime.c b/compat/check_asctime.c +new file mode 100644 +index 0000000..b0e56f0 +--- /dev/null ++++ b/compat/check_asctime.c +@@ -0,0 +1,11 @@ ++#include ++#include ++ ++int main() ++{ ++ struct tm tm; ++ ++ (void) asctime_r (&tm, NULL); ++ ++ return (0); ++} +diff --git a/compat/compat.h b/compat/compat.h +index c1ee0f9..0c4ac66 100644 +--- a/compat/compat.h ++++ b/compat/compat.h +@@ -33,6 +33,9 @@ extern "C" { + #if !STD_GETPWUID + #define _POSIX_PTHREAD_SEMANTICS 1 + #endif ++#if !STD_ASCTIME ++#define _POSIX_PTHREAD_SEMANTICS 1 ++#endif + + #if !HAVE_GETLINE + #include +diff --git a/configure b/configure +index b5465e4..e3aa857 100755 +--- a/configure ++++ b/configure +@@ -530,6 +530,17 @@ else + fi + rm -f compat/check_getpwuid + ++printf "Checking for standard version of asctime_r... " ++if ${CC} -o compat/check_asctime "$srcdir"/compat/check_asctime.c > /dev/null 2>&1 ++then ++ printf "Yes.\n" ++ std_asctime=1 ++else ++ printf "No (will define _POSIX_PTHREAD_SEMANTICS to get it).\n" ++ std_asctime=0 ++fi ++rm -f compat/check_asctime ++ + printf "int main(void){return 0;}\n" > minimal.c + + printf "Checking for rpath support... " +@@ -697,6 +708,11 @@ HAVE_STRCASESTR = ${have_strcasestr} + # to enable the standards-compliant version -- needed for Solaris) + STD_GETPWUID = ${std_getpwuid} + ++# Whether the asctime_r function is standards-compliant ++# (if not, then notmuch will #define _POSIX_PTHREAD_SEMANTICS ++# to enable the standards-compliant version -- needed for Solaris) ++STD_ASCTIME = ${std_asctime} ++ + # Supported platforms (so far) are: LINUX, MACOSX, SOLARIS, FREEBSD, OPENBSD + PLATFORM = ${platform} + +@@ -743,11 +759,13 @@ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ + \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ + \$(VALGRIND_CFLAGS) \\ + -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ +- -DSTD_GETPWUID=\$(STD_GETPWUID) ++ -DSTD_GETPWUID=\$(STD_GETPWUID) \\ ++ -DSTD_ASCTIME=\$(STD_ASCTIME) + CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ + \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ + \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\ + -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ +- -DSTD_GETPWUID=\$(STD_GETPWUID) ++ -DSTD_GETPWUID=\$(STD_GETPWUID) \\ ++ -DSTD_ASCTIME=\$(STD_ASCTIME) + CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS) + EOF +-- +1.7.9.2 + -- 2.26.2