mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-25 04:18:08 +01:00
getpwuid: check for standards compliance (Solaris support)
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 getpwuid_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_getpwuid.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:
parent
e41cd1c518
commit
31c7001c99
3 changed files with 36 additions and 2 deletions
11
compat/check_getpwuid.c
Normal file
11
compat/check_getpwuid.c
Normal file
|
@ -0,0 +1,11 @@
|
|||
#include <stdio.h>
|
||||
#include <pwd.h>
|
||||
|
||||
int main()
|
||||
{
|
||||
struct passwd passwd, *ignored;
|
||||
|
||||
(void) getpwuid_r (0, &passwd, NULL, 0, &ignored);
|
||||
|
||||
return (0);
|
||||
}
|
|
@ -30,6 +30,10 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#if !STD_GETPWUID
|
||||
#define _POSIX_PTHREAD_SEMANTICS 1
|
||||
#endif
|
||||
|
||||
#if !HAVE_GETLINE
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
|
|
23
configure
vendored
23
configure
vendored
|
@ -519,6 +519,17 @@ else
|
|||
fi
|
||||
rm -f compat/have_strcasestr
|
||||
|
||||
printf "Checking for standard version of getpwuid_r... "
|
||||
if ${CC} -o compat/check_getpwuid "$srcdir"/compat/check_getpwuid.c > /dev/null 2>&1
|
||||
then
|
||||
printf "Yes.\n"
|
||||
std_getpwuid=1
|
||||
else
|
||||
printf "No (will define _POSIX_PTHREAD_SEMANTICS to get it).\n"
|
||||
std_getpwuid=0
|
||||
fi
|
||||
rm -f compat/check_getpwuid
|
||||
|
||||
printf "int main(void){return 0;}\n" > minimal.c
|
||||
|
||||
printf "Checking for rpath support... "
|
||||
|
@ -681,6 +692,11 @@ HAVE_GETLINE = ${have_getline}
|
|||
# build its own version)
|
||||
HAVE_STRCASESTR = ${have_strcasestr}
|
||||
|
||||
# Whether the getpwuid_r function is standards-compliant
|
||||
# (if not, then notmuch will #define _POSIX_PTHREAD_SEMANTICS
|
||||
# to enable the standards-compliant version -- needed for Solaris)
|
||||
STD_GETPWUID = ${std_getpwuid}
|
||||
|
||||
# Supported platforms (so far) are: LINUX, MACOSX, SOLARIS, FREEBSD, OPENBSD
|
||||
PLATFORM = ${platform}
|
||||
|
||||
|
@ -725,10 +741,13 @@ WITH_ZSH = ${WITH_ZSH}
|
|||
# Combined flags for compiling and linking against all of the above
|
||||
CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\
|
||||
\$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\
|
||||
\$(VALGRIND_CFLAGS) -DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)
|
||||
\$(VALGRIND_CFLAGS) \\
|
||||
-DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\
|
||||
-DSTD_GETPWUID=\$(STD_GETPWUID)
|
||||
CONFIGURE_CXXFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS) \\
|
||||
\$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND) \\
|
||||
\$(VALGRIND_CFLAGS) \$(XAPIAN_CXXFLAGS) \\
|
||||
-DHAVE_STRCASESTR=\$(HAVE_STRCASESTR)
|
||||
-DHAVE_STRCASESTR=\$(HAVE_STRCASESTR) \\
|
||||
-DSTD_GETPWUID=\$(STD_GETPWUID)
|
||||
CONFIGURE_LDFLAGS = \$(GMIME_LDFLAGS) \$(TALLOC_LDFLAGS) \$(XAPIAN_LDFLAGS)
|
||||
EOF
|
||||
|
|
Loading…
Reference in a new issue