From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ADB09138350 for ; Sat, 25 Jan 2020 17:48:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DE519E0857; Sat, 25 Jan 2020 17:48:26 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8000E0857 for ; Sat, 25 Jan 2020 17:48:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4CACD34E260 for ; Sat, 25 Jan 2020 17:48:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44BAC3E for ; Sat, 25 Jan 2020 17:48:22 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1579974455.47d22ae9aaaba1133f8f503cdb24a8a9f59494b6.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logrotate/, app-admin/logrotate/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/logrotate/files/gcc-fnocommon.patch app-admin/logrotate/logrotate-3.14.0.ebuild app-admin/logrotate/logrotate-3.15.1.ebuild X-VCS-Directories: app-admin/logrotate/files/ app-admin/logrotate/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: 47d22ae9aaaba1133f8f503cdb24a8a9f59494b6 X-VCS-Branch: master Date: Sat, 25 Jan 2020 17:48:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 62cae1ce-41d7-485e-b906-03618f7e935c X-Archives-Hash: 76d45a0afd098868e9331da66232e827 commit: 47d22ae9aaaba1133f8f503cdb24a8a9f59494b6 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Jan 25 17:47:35 2020 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sat Jan 25 17:47:35 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d22ae9 app-admin/logrotate: fix build with -fno-common Closes: https://bugs.gentoo.org/705882 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mikle Kolyada gentoo.org> app-admin/logrotate/files/gcc-fnocommon.patch | 41 +++++++++++++++++++++++++++ app-admin/logrotate/logrotate-3.14.0.ebuild | 2 +- app-admin/logrotate/logrotate-3.15.1.ebuild | 3 +- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/app-admin/logrotate/files/gcc-fnocommon.patch b/app-admin/logrotate/files/gcc-fnocommon.patch new file mode 100644 index 00000000000..d490c20ce0a --- /dev/null +++ b/app-admin/logrotate/files/gcc-fnocommon.patch @@ -0,0 +1,41 @@ +From 908e86191bf062711ea44c922e66d27203e90214 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= +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; diff --git a/app-admin/logrotate/logrotate-3.14.0.ebuild b/app-admin/logrotate/logrotate-3.14.0.ebuild index 4cb39bde390..729f5629d43 100644 --- a/app-admin/logrotate/logrotate-3.14.0.ebuild +++ b/app-admin/logrotate/logrotate-3.14.0.ebuild @@ -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 } diff --git a/app-admin/logrotate/logrotate-3.15.1.ebuild b/app-admin/logrotate/logrotate-3.15.1.ebuild index 58b95631d2d..eef82c310b8 100644 --- a/app-admin/logrotate/logrotate-3.15.1.ebuild +++ b/app-admin/logrotate/logrotate-3.15.1.ebuild @@ -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() {