From eec40af5bfe21d971a9d17cfa8bce587cb30da81 Mon Sep 17 00:00:00 2001 From: Blake Jones Date: Tue, 6 Nov 2012 11:01:55 +1600 Subject: [PATCH] [PATCH v2 02/10] asctime: check for standards compliance (Solaris support) --- 50/0b5f6d3d3fb3b028f8c4970e08796b347d5e29 | 159 ++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 50/0b5f6d3d3fb3b028f8c4970e08796b347d5e29 diff --git a/50/0b5f6d3d3fb3b028f8c4970e08796b347d5e29 b/50/0b5f6d3d3fb3b028f8c4970e08796b347d5e29 new file mode 100644 index 000000000..999720310 --- /dev/null +++ b/50/0b5f6d3d3fb3b028f8c4970e08796b347d5e29 @@ -0,0 +1,159 @@ +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 7E8FE429E33 + for ; Mon, 5 Nov 2012 11:02:25 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 lozR77N3nXta for ; + Mon, 5 Nov 2012 11:02:24 -0800 (PST) +Received: from foo.net (70-36-235-136.dsl.static.sonic.net [70.36.235.136]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 69C4C429E2E + for ; Mon, 5 Nov 2012 11:02:22 -0800 (PST) +Received: from foo.net (localhost [127.0.0.1]) + by foo.net (8.14.5+Sun/8.14.5) with ESMTP id qA5J2KNt019088; + Mon, 5 Nov 2012 11:02:20 -0800 (PST) +Received: (from blakej@localhost) + by foo.net (8.14.5+Sun/8.14.5/Submit) id qA5J2KHr019087; + Mon, 5 Nov 2012 11:02:20 -0800 (PST) +From: Blake Jones +To: notmuch@notmuchmail.org +Subject: [PATCH v2 02/10] asctime: check for standards compliance (Solaris + support) +Date: Mon, 5 Nov 2012 11:01:55 -0800 +Message-Id: <1352142123-18286-3-git-send-email-blakej@foo.net> +X-Mailer: git-send-email 1.7.3.2 +In-Reply-To: <1352142123-18286-1-git-send-email-blakej@foo.net> +References: <1352142123-18286-1-git-send-email-blakej@foo.net> +X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0.2 + (foo.net [127.0.0.1]); Mon, 05 Nov 2012 11:02:20 -0800 (PST) +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: Mon, 05 Nov 2012 19:02:26 -0000 + +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. +--- + compat/check_asctime.c | 18 ++++++++++++++++++ + compat/compat.h | 3 +++ + configure | 22 ++++++++++++++++++++-- + 3 files changed, 41 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..c508fbf +--- /dev/null ++++ b/compat/check_asctime.c +@@ -0,0 +1,18 @@ ++/* ++ * This compatibility check actually succeeds (on Solaris) if ++ * _POSIX_PTHREAD_SEMANTICS is not defined. But we need to #define that to get ++ * the right version of getpwuid_r(), so we define it here to ensure that the ++ * compatibility check ends up doing the same thing as the rest of the code. ++ */ ++#define _POSIX_PTHREAD_SEMANTICS 1 ++#include ++#include ++ ++int main() ++{ ++ struct tm tm; ++ ++ (void) asctime_r (&tm, NULL, 0); ++ ++ return (0); ++} +diff --git a/compat/compat.h b/compat/compat.h +index efea023..e5f833e 100644 +--- a/compat/compat.h ++++ b/compat/compat.h +@@ -57,6 +57,9 @@ char* strcasestr(const char *haystack, const char *needle); + #if !STD_GETPWUID + #define _POSIX_PTHREAD_SEMANTICS 1 + #endif ++#if !STD_ASCTIME ++#define _POSIX_PTHREAD_SEMANTICS 1 ++#endif + + #ifdef __cplusplus + } +diff --git a/configure b/configure +index bb5031e..d153f57 100755 +--- a/configure ++++ b/configure +@@ -523,6 +523,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... " +@@ -687,6 +698,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} + +@@ -733,11 +749,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.3.2 + -- 2.26.2