factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support operating systems without some non-POSIX headers

Browse Source 
The arpa/nameser.h, netinet/ip.h, and resolv.h headers are not crucial
to building LibreSSL. The netinet/ip.h header is used in nc(1) for
optional IPTOS_ features that can be ifdef'd on systems without support.

The endian.h header is the upcoming standard header and should be used
whenever available and correct. The machine/endian.h header is
non-standard and doesn't have to exist on POSIX systems.

Fix the check for getpagesize(3) not forward declaring the function,
such that CFLAGS with -Werror=implicit-function-declaration doesn't
cause the check to fail.
This commit is contained in:
Jonas 'Sortie' Termansen 2021-10-03 13:33:16 +02:00
parent 691c7c7514
commit fcf6c87788
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/compat/arpa/nameser.h
View File

@ -4,7 +4,9 @@
*/
#ifndef _WIN32
#ifdef HAVE_ARPA_NAMESER_H
#include_next <arpa/nameser.h>
#endif
#else
#include <win32netcompat.h>

2
include/compat/machine/endian.h
View File

@ -21,7 +21,7 @@
#define BYTE_ORDER BIG_ENDIAN
#endif
#elif defined(__linux__) || defined(__midipix__)
#elif defined(HAVE_ENDIAN_H)
#include <endian.h>
#elif defined(__sun) || defined(_AIX) || defined(__hpux)

2
include/compat/netinet/ip.h
View File

@ -8,7 +8,9 @@
#endif
#ifndef _WIN32
#ifdef HAVE_NETINET_IP_H
#include_next <netinet/ip.h>
#endif
#else
#include <win32netcompat.h>
#endif

2
include/compat/resolv.h
View File

@ -12,7 +12,7 @@
#else
#include <../include/resolv.h>
#endif
#else
#elif defined(HAVE_RESOLV_H)
#include_next <resolv.h>
#endif

6
m4/check-libc.m4
View File

@ -1,6 +1,7 @@
AC_DEFUN([CHECK_LIBC_COMPAT], [
# Check for libc headers
AC_CHECK_HEADERS([err.h readpassphrase.h])
AC_CHECK_HEADERS([arpa/nameser.h endian.h netinet/ip.h resolv.h])
# Check for general libc functions
AC_CHECK_FUNCS([asprintf freezero memmem])
AC_CHECK_FUNCS([readpassphrase reallocarray recallocarray])
@ -9,10 +10,7 @@ AC_CHECK_FUNCS([timegm _mkgmtime timespecsub])
AC_CHECK_FUNCS([getprogname syslog syslog_r])
AC_CACHE_CHECK([for getpagesize], ac_cv_func_getpagesize, [
AC_LINK_IFELSE([AC_LANG_PROGRAM([[
// Since Android NDK v16 getpagesize is defined as inline inside unistd.h
#ifdef __ANDROID__
# include <unistd.h>
#endif
#include <unistd.h>
]], [[
getpagesize();
]])],