From: Vladimir.Marek@oracle.com
To: notmuch@notmuchmail.org
Cc: Vladimir Marek <vlmarek@volny.cz>
Subject: [PATCH 2/4] asctime: check for standards compliance (Solaris support)
Date: Mon, 6 May 2013 17:16:00 +0200 [thread overview]
Message-ID: <1367853362-11846-3-git-send-email-Vladimir.Marek@oracle.com> (raw)
In-Reply-To: <1367853362-11846-1-git-send-email-Vladimir.Marek@oracle.com>
From: Vladimir Marek <vlmarek@volny.cz>
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 <vlmarek@volny.cz>
---
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 <time.h>
+#include <stdio.h>
+
+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 <stdio.h>
diff --git a/configure b/configure
index 8ef7bac..99ec71a 100755
--- a/configure
+++ b/configure
@@ -528,6 +528,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... "
@@ -692,6 +703,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}
@@ -738,11 +754,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
next prev parent reply other threads:[~2013-05-06 15:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-06 15:15 Solaris support - missing or incompatible functions Vladimir.Marek
2013-05-06 15:15 ` [PATCH 1/4] getpwuid: check for standards compliance (Solaris support) Vladimir.Marek
2013-05-06 15:16 ` Vladimir.Marek [this message]
2013-05-06 15:16 ` [PATCH 3/4] strsep: check for availability " Vladimir.Marek
2013-05-06 15:16 ` [PATCH 4/4] timegm: add portable implementation " Vladimir.Marek
2013-05-12 20:02 ` Solaris support - missing or incompatible functions Jani Nikula
2013-05-12 20:21 ` Vladimir Marek
2013-05-12 20:45 ` Jani Nikula
2013-05-13 5:05 ` Vladimir Marek
2013-05-18 13:19 ` David Bremner
2013-05-20 9:48 ` Vladimir Marek
2013-05-20 11:10 ` Tomi Ollila
2013-05-20 13:19 ` Vladimir Marek
2013-08-16 12:05 ` Vladimir Marek
2013-08-16 12:32 ` Tomi Ollila
-- strict thread matches above, loose matches on Subject: below --
2013-08-16 14:38 Solaris support - missing or incompatible functions (v2) Vladimir.Marek
2013-08-16 14:38 ` [PATCH 2/4] asctime: check for standards compliance (Solaris support) Vladimir.Marek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1367853362-11846-3-git-send-email-Vladimir.Marek@oracle.com \
--to=vladimir.marek@oracle.com \
--cc=notmuch@notmuchmail.org \
--cc=vlmarek@volny.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).