3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-27 15:41:05 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4309 from dgloe-hpe/3313-fork-detection

Browse Source 
Problem: Fix fork detection on gcc 7
This commit is contained in:
Luca Boccassi 2021-11-23 19:17:26 +00:00 committed by GitHub
commit 5a9c174dab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RELICENSE/hewlett_packard_enterprise.md
View File

@ -5,9 +5,11 @@ that grants permission to relicense its copyrights in the libzmq C++
library (ZeroMQ) under the Mozilla Public License v2 (MPLv2). library (ZeroMQ) under the Mozilla Public License v2 (MPLv2).
A portion of the commits made by the Github handle "brc859844", with A portion of the commits made by the Github handle "brc859844", with
commit author "Brett Cameron <Brett.Cameron@hp.com>", are copyright of Hewlett Packard Enterprise. commit author "Brett Cameron <Brett.Cameron@hp.com>", and the commits made
by the Github handle "dgloe-hpe", with commit author
"David Gloe <david.gloe@hpe.com>", are copyright of Hewlett Packard Enterprise.
This document hereby grants the libzmq project team to relicense libzmq, This document hereby grants the libzmq project team to relicense libzmq,
including all past, present and future contributions of the author listed above. including all past, present and future contributions of the authors listed above.
Hewlett Packard Enterprise Hewlett Packard Enterprise
2019/03/12 2019/03/12

19
configure.ac
View File

@ -795,9 +795,24 @@ AC_LANG_POP([C++])
# Checks for library functions. # Checks for library functions.
AC_TYPE_SIGNAL AC_TYPE_SIGNAL
AC_CHECK_FUNCS(perror gettimeofday clock_gettime memset socket getifaddrs freeifaddrs fork mkdtemp accept4) AC_CHECK_FUNCS(perror gettimeofday clock_gettime memset socket getifaddrs freeifaddrs mkdtemp accept4)
AC_CHECK_HEADERS([alloca.h]) AC_CHECK_HEADERS([alloca.h])
# AC_CHECK_FUNCS(fork) fails on gcc 7
AC_MSG_CHECKING([whether fork is available])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
[[#include <unistd.h>]],
[[return fork();]])
],[
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_FORK, [1], [fork is available])
AM_CONDITIONAL(HAVE_FORK, true)
],[
AC_MSG_RESULT([no])
AM_CONDITIONAL(HAVE_FORK, false)
])
# string.h doesn't seem to be included by default in Fedora 30 # string.h doesn't seem to be included by default in Fedora 30
AC_MSG_CHECKING([whether strnlen is available]) AC_MSG_CHECKING([whether strnlen is available])
AC_COMPILE_IFELSE( AC_COMPILE_IFELSE(
@ -995,8 +1010,6 @@ LIBZMQ_CHECK_GETRANDOM([
[Whether getrandom is supported.]) [Whether getrandom is supported.])
]) ])
AM_CONDITIONAL(HAVE_FORK, test "x$ac_cv_func_fork" = "xyes")
if test "x$cross_compiling" = "xyes"; then if test "x$cross_compiling" = "xyes"; then
# Enable draft by default when cross-compiling # Enable draft by default when cross-compiling
defaultval=yes defaultval=yes