diff options
| author | Andrei Belov <defan@nginx.com> | 2021-05-27 17:03:24 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2021-05-27 17:03:24 +0300 |
| commit | 0afb4b5790c5a37ba6b880eb351a65fe00521fbe (patch) | |
| tree | c7e0b6bed92ee62a5e8b13c945c4134e68554cec /auto | |
| parent | 21ff5e086ece7188df3b7338d228fa4fb7f886af (diff) | |
| parent | d06e55dfa3692e27a92ff6c2534bb083416bc0c8 (diff) | |
| download | unit-0afb4b5790c5a37ba6b880eb351a65fe00521fbe.tar.gz unit-0afb4b5790c5a37ba6b880eb351a65fe00521fbe.tar.bz2 | |
Merged with the default branch.1.24.0-1
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/files | 32 | ||||
| -rw-r--r-- | auto/make | 2 | ||||
| -rw-r--r-- | auto/modules/go | 2 | ||||
| -rw-r--r-- | auto/ssltls | 14 |
4 files changed, 48 insertions, 2 deletions
@@ -49,3 +49,35 @@ nxt_feature_test="#include <fcntl.h> return 0; }" . auto/feature + + +nxt_feature="openat2()" +nxt_feature_name=NXT_HAVE_OPENAT2 +nxt_feature_run= +nxt_feature_incs= +nxt_feature_libs= +nxt_feature_test="#include <fcntl.h> + #include <unistd.h> + #include <sys/syscall.h> + #include <linux/openat2.h> + #include <string.h> + + int main() { + struct open_how how; + + memset(&how, 0, sizeof(how)); + + how.flags = O_RDONLY; + how.mode = O_NONBLOCK; + how.resolve = RESOLVE_IN_ROOT + | RESOLVE_NO_SYMLINKS + | RESOLVE_NO_XDEV; + + int fd = syscall(SYS_openat2, AT_FDCWD, \".\", + &how, sizeof(how)); + if (fd == -1) + return 1; + + return 0; + }" +. auto/feature @@ -368,7 +368,7 @@ ${NXT_DAEMON}-install: $NXT_DAEMON install-check manpage-install: manpage install-check install -d \$(DESTDIR)$NXT_MANDIR/man8 - install -p $NXT_BUILD_DIR/unitd.8 \$(DESTDIR)$NXT_MANDIR/man8/ + install -p -m644 $NXT_BUILD_DIR/unitd.8 \$(DESTDIR)$NXT_MANDIR/man8/ .PHONY: uninstall ${NXT_DAEMON}-uninstall manpage-uninstall diff --git a/auto/modules/go b/auto/modules/go index 8bb9216e..7324ffbe 100644 --- a/auto/modules/go +++ b/auto/modules/go @@ -111,7 +111,7 @@ install: ${NXT_GO}-install ${NXT_GO}: ${NXT_GO}-install: ${NXT_GO}-install-src ${NXT_GO}-install-env - GOPATH=\$(DESTDIR)\$(GOPATH) ${NXT_GO} build ${NXT_GO_PKG} + GOPATH=\$(DESTDIR)\$(GOPATH) GO111MODULE=auto ${NXT_GO} build ${NXT_GO_PKG} ${NXT_GO}-install-src: install -d \$(DESTDIR)\$(NXT_GO_DST)/src/${NXT_GO_PKG} diff --git a/auto/ssltls b/auto/ssltls index f034b758..f9363dde 100644 --- a/auto/ssltls +++ b/auto/ssltls @@ -52,6 +52,20 @@ if [ $NXT_OPENSSL = YES ]; then $echo exit 1; fi + + + nxt_feature="OpenSSL SSL_CONF_cmd()" + nxt_feature_name=NXT_HAVE_OPENSSL_CONF_CMD + nxt_feature_run= + nxt_feature_incs= + nxt_feature_libs="$NXT_OPENSSL_LIBS" + nxt_feature_test="#include <openssl/ssl.h> + + int main() { + SSL_CONF_cmd(NULL, NULL, NULL); + return 0; + }" + . auto/feature fi |