gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 18:58:08 -07:00
Code Issues Projects Releases Wiki Activity

app-admin/logrotate: fix build with -fno-common

Browse Source 
Closes: https://bugs.gentoo.org/705882
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
This commit is contained in:
Mikle Kolyada
2020-01-25 20:47:35 +03:00
parent e238b6738b
commit 47d22ae9aa
3 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app-admin/logrotate/files/gcc-fnocommon.patch Normal file
View File

@@ -0,0 +1,41 @@
From 908e86191bf062711ea44c922e66d27203e90214 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
---
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
app-admin/logrotate/logrotate-3.14.0.ebuild
View File

@@ -34,7 +34,7 @@ move_old_state_file() {
elog "See bug #357275"
if [[ -e "${OLDSTATEFILE}" ]] ; then
elog "Moving your current state file to new location: ${STATEFILE}"
mv -n "${OLDSTATEFILE}" "${STATEFILE}"
mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
fi
}

3
app-admin/logrotate/logrotate-3.15.1.ebuild
View File

@@ -34,7 +34,7 @@ move_old_state_file() {
elog "See bug #357275"
if [[ -e "${OLDSTATEFILE}" ]] ; then
elog "Moving your current state file to new location: ${STATEFILE}"
mv -n "${OLDSTATEFILE}" "${STATEFILE}"
mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
fi
}
@@ -45,6 +45,7 @@ install_cron_file() {
PATCHES=(
"${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch"
"${FILESDIR}/gcc-fnocommon.patch"
)
src_prepare() {