--- /dev/null
+Return-Path: <blakej@foo.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 8631F431FD8\r
+ for <notmuch@notmuchmail.org>; Sat, 3 Nov 2012 20:24:23 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id dfbYinEmaS26 for <notmuch@notmuchmail.org>;\r
+ Sat, 3 Nov 2012 20:24:22 -0700 (PDT)\r
+Received: from foo.net (70-36-235-136.dsl.static.sonic.net [70.36.235.136])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 9C7FF431FB6\r
+ for <notmuch@notmuchmail.org>; Sat, 3 Nov 2012 20:24:20 -0700 (PDT)\r
+Received: from foo.net (localhost [127.0.0.1])\r
+ by foo.net (8.14.5+Sun/8.14.5) with ESMTP id qA43GEAC025659;\r
+ Sat, 3 Nov 2012 20:16:14 -0700 (PDT)\r
+Received: (from blakej@localhost)\r
+ by foo.net (8.14.5+Sun/8.14.5/Submit) id qA43GEpI025658;\r
+ Sat, 3 Nov 2012 20:16:14 -0700 (PDT)\r
+From: Blake Jones <blakej@foo.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 02/10] asctime: check for standards compliance (Solaris\r
+ support)\r
+Date: Sat, 3 Nov 2012 20:15:54 -0700\r
+Message-Id: <1351998962-25135-3-git-send-email-blakej@foo.net>\r
+X-Mailer: git-send-email 1.7.3.2\r
+In-Reply-To: <1351998962-25135-1-git-send-email-blakej@foo.net>\r
+References: <1351998962-25135-1-git-send-email-blakej@foo.net>\r
+X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-2.0.2\r
+ (foo.net [127.0.0.1]); Sat, 03 Nov 2012 20:16:14 -0700 (PDT)\r
+X-Mailman-Approved-At: Sun, 04 Nov 2012 01:30:19 -0800\r
+Cc: Blake Jones <blakej@foo.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 04 Nov 2012 03:24:24 -0000\r
+\r
+Add checks to "configure" to see whether _POSIX_PTHREAD_SEMANTICS needs\r
+to be defined to get the right number of arguments in the prototypes for\r
+asctime_r(). Solaris' default implementation conforms to POSIX.1c\r
+Draft 6, rather than the final POSIX.1c spec. The standards-compliant\r
+version can be used by defining _POSIX_PTHREAD_SEMANTICS.\r
+\r
+This change also adds the file "compat/check_asctime.c", which\r
+configure uses to perform its check, and modifies compat/compat.h to\r
+define _POSIX_PTHREAD_SEMANTICS if configure detected it was needed.\r
+---\r
+ compat/check_asctime.c | 17 +++++++++++++++++\r
+ compat/compat.h | 3 +++\r
+ configure | 22 ++++++++++++++++++++--\r
+ 3 files changed, 40 insertions(+), 2 deletions(-)\r
+ create mode 100644 compat/check_asctime.c\r
+\r
+diff --git a/compat/check_asctime.c b/compat/check_asctime.c\r
+new file mode 100644\r
+index 0000000..a595110\r
+--- /dev/null\r
++++ b/compat/check_asctime.c\r
+@@ -0,0 +1,17 @@\r
++/*\r
++ * This compatibility check actually succeeds (on Solaris) if\r
++ * _POSIX_PTHREAD_SEMANTICS is not defined. But we need to define that to get\r
++ * the right version of getpwuid_r(), so we define it here to ensure that the\r
++ * compatibility check ends up doing the same thing as the rest of the code.\r
++ */\r
++#define _POSIX_PTHREAD_SEMANTICS\r
++#include <time.h>\r
++\r
++int main()\r
++{\r
++ struct tm tm;\r
++\r
++ (void) asctime_r (&tm, NULL, 0);\r
++\r
++ return (0);\r
++}\r
+diff --git a/compat/compat.h b/compat/compat.h\r
+index 8374d2f..b750501 100644\r
+--- a/compat/compat.h\r
++++ b/compat/compat.h\r
+@@ -57,6 +57,9 @@ char* strcasestr(const char *haystack, const char *needle);\r
+ #if !STD_GETPWUID\r
+ #define _POSIX_PTHREAD_SEMANTICS\r
+ #endif\r
++#if !STD_ASCTIME\r
++#define _POSIX_PTHREAD_SEMANTICS\r
++#endif\r
+ \r
+ #ifdef __cplusplus\r
+ }\r
+diff --git a/configure b/configure\r
+index 3c18a45..047c011 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -523,6 +523,17 @@ else\r
+ fi\r
+ rm -f compat/check_getpwuid\r
+ \r
++printf "Checking for standard version of asctime_r... "\r
++if ${CC} -o compat/check_asctime "$srcdir"/compat/check_asctime.c > /dev/null 2>&1\r
++then\r
++ printf "Yes.\n"\r
++ std_asctime=1\r
++else\r
++ printf "No (will define _POSIX_PTHREAD_SEMANTICS to get it).\n"\r
++ std_asctime=0\r
++fi\r
++rm -f compat/check_asctime\r
++\r
+ printf "int main(void){return 0;}\n" > minimal.c\r
+ \r
+ printf "Checking for rpath support... "\r
+@@ -687,6 +698,11 @@ HAVE_STRCASESTR = ${have_strcasestr}\r
+ # to enable the standards-compliant version -- needed for Solaris)\r
+ STD_GETPWUID = ${std_getpwuid}\r
+ \r
++# Whether the asctime_r function is standards-compliant\r
++# (if not, then notmuch will compile with -D_POSIX_PTHREAD_SEMANTICS\r
++# to enable the standards-compliant version -- needed for Solaris)\r
++STD_ASCTIME = ${std_asctime}\r
++\r
+ # Supported platforms (so far) are: LINUX, MACOSX, SOLARIS, FREEBSD, OPENBSD\r
+ PLATFORM = ${platform}\r
+ \r
+@@ -733,11 +749,13 @@ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\\r
+ \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\\r
+ \$(VALGRIND_CFLAGS) \\\r
+ -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\\r
+- -DSTD_GETPWUID=\$(STD_GETPWUID)\r
++ -DSTD_GETPWUID=\$(STD_GETPWUID) \\\r
++ -DSTD_ASCTIME=\$(STD_ASCTIME)\r
+ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\\r
+ \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\\r
+ \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\\r
+ -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\\r
+- -DSTD_GETPWUID=\$(STD_GETPWUID)\r
++ -DSTD_GETPWUID=\$(STD_GETPWUID) \\\r
++ -DSTD_ASCTIME=\$(STD_ASCTIME)\r
+ CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS)\r
+ EOF\r
+-- \r
+1.7.9.2\r
+\r
projects / notmuch-archives.git / commitdiff