make the code compile with gcc-10

This commit is contained in:
Kamil Dudka 2020-01-30 14:21:39 +01:00
parent 07c321c2d2
commit 100da8629b
2 changed files with 54 additions and 1 deletions

View File

@ -0,0 +1,47 @@
From d515f9a31fb656d31bdbcf8f6700d464e5af9645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Wed, 8 Jan 2020 10:54:53 +0100
Subject: [PATCH] split declaration and definition of queue variable
Support compilation with -fno-common flag, which is the default for GCC 10.
Fixes: #288
Closes #289
Upstream-commit: 908e86191bf062711ea44c922e66d27203e90214
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
---
config.c | 2 ++
logrotate.h | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/config.c b/config.c
index 0e9a828..f027c7e 100644
--- a/config.c
+++ b/config.c
@@ -28,6 +28,8 @@
#include "log.h"
#include "logrotate.h"
+struct logInfoHead logs;
+
#if !defined(GLOB_ABORTED) && defined(GLOB_ABEND)
#define GLOB_ABORTED GLOB_ABEND
#endif
diff --git a/logrotate.h b/logrotate.h
index 1c178da..6c1c2e7 100644
--- a/logrotate.h
+++ b/logrotate.h
@@ -89,7 +89,8 @@ struct logInfo {
TAILQ_ENTRY(logInfo) list;
};
-TAILQ_HEAD(logInfoHead, logInfo) logs;
+TAILQ_HEAD(logInfoHead, logInfo);
+extern struct logInfoHead logs;
extern int numLogs;
extern int debug;
--
2.21.1

View File

@ -1,7 +1,7 @@
Summary: Rotates, compresses, removes and mails system log files
Name: logrotate
Version: 3.15.1
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+
Url: https://github.com/logrotate/logrotate
Source: https://github.com/logrotate/logrotate/releases/download/%{version}/logrotate-%{version}.tar.xz
@ -20,6 +20,9 @@ Requires: coreutils
Requires(post): systemd
Requires(preun): systemd
# make the code compile with gcc-10
Patch1: 0001-logrotate-3.15.1-gcc-10-build-fix.patch
%description
The logrotate utility is designed to simplify the administration of
log files on a system which generates a lot of log files. Logrotate
@ -116,6 +119,9 @@ fi
%config(noreplace) %{_sysconfdir}/rwtab.d/logrotate
%changelog
* Thu Jan 30 2020 Kamil Dudka <kdudka@redhat.com> - 3.15.1-3
- make the code compile with gcc-10
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.15.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild