Fix compilation on platforms that need sys/loadavg.h for loadavg

Make mod_load look for sys/loadavg.h using configure and include it if found.
This commit is contained in:
nros 2019-12-09 19:22:57 +00:00
parent 065f6023b0
commit f3b87ff387
5 changed files with 49 additions and 3 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.9 2019/10/13 19:52:47 maya Exp $
# $NetBSD: Makefile.common,v 1.10 2019/12/09 19:22:57 nros Exp $
# used by net/proftpd/Makefile
# used by net/proftpd/Makefile.module
@ -41,7 +41,8 @@ CHECK_SHLIBS_SKIP= libexec/proftpd/*.a
CHECK_SSP_SKIP= ${CHECK_SHLIBS_SKIP}
pre-configure:
cd ${WRKSRC} && ${TOOLS_CMD.autoconf}
cd ${WRKSRC} && ${TOOLS_CMD.autoconf} &&\
cd contrib/mod_load && ${TOOLS_CMD.autoconf}
.include "options.mk"

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.48 2019/10/13 19:52:47 maya Exp $
$NetBSD: distinfo,v 1.49 2019/12/09 19:22:57 nros Exp $
SHA1 (proftpd-1.3.6.tar.gz) = 7e9269f9448c37f82e6faa9edaa3186ff5ba82d2
RMD160 (proftpd-1.3.6.tar.gz) = 5da3934e46ea517ee6652382e5e3a9f87e591dd6
@ -7,6 +7,9 @@ Size (proftpd-1.3.6.tar.gz) = 20251898 bytes
SHA1 (patch-Make.rules.in) = 4689fcb4aff5c9b3a2e47a43b93e76101d54e812
SHA1 (patch-Makefile.in) = 332dcd9d773770c10d876dc9da1dc7f6b1c15421
SHA1 (patch-configure.in) = ed8e190a89cbfc3276d9e77f0bbb624f6d19f816
SHA1 (patch-contrib_mod__load_configure.in) = 0a72c47bf813ffd2ca8f8188a2d8596ec4d60200
SHA1 (patch-contrib_mod__load_mod__load.c) = c99e79b3c63dd2c5a14361568e1e68966bd456c5
SHA1 (patch-contrib_mod__load_mod__load.h.in) = 83f5592a9c9a2a90ec500bba382326dccf8f05e5
SHA1 (patch-contrib_mod__sftp_Makefile.in) = 8a805d777597b4fb06a45b484373880e535a0cee
SHA1 (patch-contrib_mod_tls.c) = e36dfa9427804b41eb2ad49378b62890325d50ed
SHA1 (patch-include_pfilter.h) = abc00fe5cc14115c937e9b3790d3c0ca259ee12c

View file

@ -0,0 +1,13 @@
$NetBSD: patch-contrib_mod__load_configure.in,v 1.1 2019/12/09 19:22:57 nros Exp $
* solaris and derivates has loadavg in sys/loadavg.h
--- contrib/mod_load/configure.in.orig 2019-12-09 18:12:06.479685628 +0000
+++ contrib/mod_load/configure.in
@@ -63,7 +63,7 @@ AC_ARG_WITH(libraries,
])
AC_HEADER_STDC
-AC_CHECK_HEADERS(stdlib.h unistd.h limits.h fcntl.h)
+AC_CHECK_HEADERS(stdlib.h unistd.h limits.h fcntl.h sys/loadavg.h)
AC_SUBST(LDFLAGS)

View file

@ -0,0 +1,15 @@
$NetBSD: patch-contrib_mod__load_mod__load.c,v 1.1 2019/12/09 19:22:57 nros Exp $
* solaris and derivates has loadavg in sys/loadavg.h
--- contrib/mod_load/mod_load.c.orig 2019-12-09 18:07:41.734696143 +0000
+++ contrib/mod_load/mod_load.c
@@ -303,6 +303,10 @@
# define LDAV_SYMBOL "avenrun"
# endif
+# ifdef HAVE_SYS_LOADAVG_H
+# include <sys/loadavg.h>
+# endif
+
# ifdef HAVE_UNISTD_H
# include <unistd.h>
# endif

View file

@ -0,0 +1,14 @@
$NetBSD: patch-contrib_mod__load_mod__load.h.in,v 1.1 2019/12/09 19:22:57 nros Exp $
* solaris and derivates has loadavg in sys/loadavg.h
--- contrib/mod_load/mod_load.h.in.orig 2019-12-09 18:10:43.656037132 +0000
+++ contrib/mod_load/mod_load.h.in
@@ -51,6 +51,9 @@
/* Define if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
+/* Define if you have the <sys/loadavg.h> header file. */
+#undef HAVE_SYS_LOADAVG_H
+
/* Define if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H