debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

asctime: check for standards compliance (Solaris support)

Browse source 
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>
This commit is contained in:
Vladimir Marek 2013-08-16 16:38:15 +02:00 committed by David Bremner
parent 31c7001c99
commit 49a0b96486
3 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
compat/check_asctime.c Normal file
View file

@ -0,0 +1,11 @@
#include <time.h>
#include <stdio.h>
int main()
{
struct tm tm;
(void) asctime_r (&tm, NULL);
return (0);
}

3
compat/compat.h
View file

@ -33,6 +33,9 @@ extern "C" {
#if !STD_GETPWUID #if !STD_GETPWUID
#define _POSIX_PTHREAD_SEMANTICS 1 #define _POSIX_PTHREAD_SEMANTICS 1
#endif #endif
#if !STD_ASCTIME
#define _POSIX_PTHREAD_SEMANTICS 1
#endif
#if !HAVE_GETLINE #if !HAVE_GETLINE
#include <stdio.h> #include <stdio.h>

22
configure vendored
View file

@ -530,6 +530,17 @@ else
fi fi
rm -f compat/check_getpwuid 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 "int main(void){return 0;}\n" > minimal.c
printf "Checking for rpath support... " printf "Checking for rpath support... "
@ -697,6 +708,11 @@ HAVE_STRCASESTR = ${have_strcasestr}
# to enable the standards-compliant version -- needed for Solaris) # to enable the standards-compliant version -- needed for Solaris)
STD_GETPWUID = ${std_getpwuid} 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 # Supported platforms (so far) are: LINUX, MACOSX, SOLARIS, FREEBSD, OPENBSD
PLATFORM = ${platform} PLATFORM = ${platform}
@ -743,11 +759,13 @@ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\
\$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\
\$(VALGRIND_CFLAGS) \\ \$(VALGRIND_CFLAGS) \\
-DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\
-DSTD_GETPWUID=\$(STD_GETPWUID) -DSTD_GETPWUID=\$(STD_GETPWUID) \\
-DSTD_ASCTIME=\$(STD_ASCTIME)
CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\ CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\
\$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\ \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\
\$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\ \$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\
-DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\ -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\
-DSTD_GETPWUID=\$(STD_GETPWUID) -DSTD_GETPWUID=\$(STD_GETPWUID) \\
-DSTD_ASCTIME=\$(STD_ASCTIME)
CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS) CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS)
EOF EOF