Better checking for shm_open() during configure.

This commit is contained in:
Sergey Kandaurov
2017-09-27 18:34:23 +03:00
parent 4f4647e187
commit aac0f06f3d
3 changed files with 17 additions and 9 deletions

View File

@@ -3,19 +3,13 @@
# Copyright (C) NGINX, Inc.
# Linux, FreeBSD, MacOSX
# FreeBSD, Solaris, MacOSX
nxt_feature="shm_open()"
nxt_feature_name=NXT_HAVE_SHM_OPEN
nxt_feature_run=yes
nxt_feature_incs=
nxt_feature_libs=
if [ "$NXT_SYSTEM" = "Linux" ]; then
nxt_feature_libs=-lrt
NXT_LIBRT=-lrt
fi
nxt_feature_test="#include <sys/mman.h>
#include <fcntl.h>
#include <sys/stat.h>
@@ -37,6 +31,20 @@ nxt_feature_test="#include <sys/mman.h>
. auto/feature
if [ $nxt_found = no ]; then
# Linux and NetBSD 7.0 shm_open() are in librt.
nxt_feature="shm_open() in librt"
nxt_feature_libs="-lrt"
. auto/feature
if [ $nxt_found = yes ]; then
NXT_LIBRT=$nxt_feature_libs
fi
fi
# Linux
nxt_feature="memfd_create()"

View File

@@ -6,8 +6,6 @@
# Linux 2.6.32 CLOCK_REALTIME_COARSE.
# Linux clock_gettime() is in librt.
NXT_LIBRT=
nxt_feature="Linux clock_gettime(CLOCK_REALTIME_COARSE)"
nxt_feature_name=NXT_HAVE_CLOCK_REALTIME_COARSE
nxt_feature_run=yes

2
configure vendored
View File

@@ -105,6 +105,8 @@ if [ $NXT_UNIX_DOMAIN = YES ]; then
nxt_have=NXT_HAVE_UNIX_DOMAIN . auto/have
fi
NXT_LIBRT=
. auto/types
. auto/clang
. auto/atomic