Attachment 233781 Details for Bug 263791 – This will fix it

[patch] This will fix it

0001-net-mgmt-collectd5-Chase-31418910e0f4-update-sysutil.patch (text/plain), 3.48 KB, created by Cy Schubert on 2022-05-07 02:10:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cy Schubert

Created: 2022-05-07 02:10:47 UTC

Size: 3.48 KB

patch

obsolete

>From 67d1ec5ee1bbe12ce0bee92d4e7b8991dd277ac0 Mon Sep 17 00:00:00 2001
>From: Cy Schubert <cy@FreeBSD.org>
>Date: Fri, 6 May 2022 19:03:30 -0700
>Subject: [PATCH] net-mgmt/collectd5: Chase 31418910e0f4, update sysutils/nut
> to 2.8.0
>
>Nut upsclient.h no longer includes time.h. Apps which build against
>upsclient.h must now include time.h or fail to detect nut libraries
>due to missing time_t.
>
>PR:		263791
>Reported by:	Petteri Valkonen <petteri.valkonen@iki.fi>
>---
> net-mgmt/collectd5/files/patch-configure.ac | 83 ++++++++++++++++++++-
> 1 file changed, 80 insertions(+), 3 deletions(-)
>
>diff --git a/net-mgmt/collectd5/files/patch-configure.ac b/net-mgmt/collectd5/files/patch-configure.ac
>index 870fc672c5ee..647b64d6aa97 100644
>--- a/net-mgmt/collectd5/files/patch-configure.ac
>+++ b/net-mgmt/collectd5/files/patch-configure.ac
>@@ -1,6 +1,63 @@
>---- configure.ac.orig	2020-03-19 09:52:56.280271200 +0100
>-+++ configure.ac	2020-03-27 19:05:05.205060000 +0100
>-@@ -6475,7 +6475,7 @@ AC_ARG_WITH([libslurm],
>+--- configure.ac.orig	2020-09-03 04:09:35.126575027 -0700
>++++ configure.ac	2022-05-06 18:59:54.574982000 -0700
>+@@ -757,7 +757,7 @@
>+ 
>+ if test "x$GCC" = "xyes"; then
>+   SAVE_CFLAGS="$CFLAGS"
>+-  CFLAGS="$CFLAGS -Wall -Werror"
>++  CFLAGS="$CFLAGS -Wall "
>+ fi
>+ SAVE_LDFLAGS="$LDFLAGS"
>+ LDFLAGS=""
>+@@ -929,7 +929,7 @@
>+ # Check for strptime {{{
>+ if test "x$GCC" = "xyes"; then
>+   SAVE_CFLAGS="$CFLAGS"
>+-  CFLAGS="$CFLAGS -Wall -Wextra -Werror"
>++  CFLAGS="$CFLAGS -Wall -Wextra "
>+ fi
>+ 
>+ AC_CHECK_FUNCS([strptime], [have_strptime="yes"], [have_strptime="no"])
>+@@ -1000,10 +1000,10 @@
>+ 
>+ # Check for timegm {{{
>+ 
>+-# These checks need -Werror because implicit function declarations are only a
>++# These checks need  because implicit function declarations are only a
>+ # warning ...
>+ SAVE_CFLAGS="$CFLAGS"
>+-CFLAGS="$CFLAGS -Werror"
>++CFLAGS="$CFLAGS "
>+ 
>+ AC_CACHE_CHECK([for timegm],
>+   [c_cv_have_timegm],
>+@@ -3874,7 +3874,7 @@
>+   SAVE_LIBS="$LIBS"
>+   CPPFLAGS="$CPPFLAGS $with_libnetsnmp_cppflags"
>+   if test "x$GCC" = "xyes"; then
>+-    CPPFLAGS="$CPPFLAGS -Wall -Werror"
>++    CPPFLAGS="$CPPFLAGS -Wall "
>+   fi
>+   LDFLAGS="$LDFLAGS $with_libnetsnmp_ldflags"
>+   LIBS="$LIBS -lnetsnmp"
>+@@ -4348,7 +4348,7 @@
>+   SAVE_LIBS="$LIBS"
>+   CFLAGS="$CFLAGS $PERL_CFLAGS"
>+   if test "x$GCC" = "xyes"; then
>+-    CFLAGS="$CFLAGS -Wall -Werror"
>++    CFLAGS="$CFLAGS -Wall "
>+   fi
>+   LIBS="$LIBS $PERL_LIBS"
>+ 
>+@@ -5810,6 +5810,7 @@
>+     [],
>+     [],
>+     [[
>++      #include <time.h>
>+       #include <stdlib.h>
>+       #include <stdio.h>
>+       #include <upsclient.h>
>+@@ -6507,7 +6508,7 @@
>      else if test -d "$with_libslurm/lib"; then
>        AC_MSG_NOTICE([Not checking for libslurm: Manually configured])
>        with_libslurm_cflags="-I$withval/include"
>@@ -9,3 +66,23 @@
>        with_libslurm="yes"
>      fi; fi; fi
>    ],
>+@@ -6579,7 +6580,7 @@
>+ AC_COLLECTD([debug],     [enable],  [feature], [debugging])
>+ AC_COLLECTD([daemon],    [disable], [feature], [daemon mode])
>+ AC_COLLECTD([getifaddrs],[enable],  [feature], [getifaddrs under Linux])
>+-AC_COLLECTD([werror],    [disable], [feature], [building with -Werror])
>++AC_COLLECTD([werror],    [disable], [feature], [building with ])
>+ 
>+ dependency_warning="no"
>+ dependency_error="no"
>+@@ -7348,8 +7349,8 @@
>+   AM_CFLAGS="-Wall"
>+   AM_CXXFLAGS="-Wall"
>+   if test "x$enable_werror" != "xno"; then
>+-    AM_CFLAGS="$AM_CFLAGS -Werror"
>+-    AM_CXXFLAGS="$AM_CXXFLAGS -Werror"
>++    AM_CFLAGS="$AM_CFLAGS "
>++    AM_CXXFLAGS="$AM_CXXFLAGS "
>+   fi
>+ fi
>+ 
>-- 
>2.35.2
>

Actions: View | Diff

Attachments on bug 263791: 233739 | 233781 | 233782 | 233833 | 233834