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 0BF0C138334 for ; Thu, 26 Jul 2018 07:32:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0DE9E0806; Thu, 26 Jul 2018 07:32:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 65345E0806 for ; Thu, 26 Jul 2018 07:32:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8A213335CA9 for ; Thu, 26 Jul 2018 07:32:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3518F373 for ; Thu, 26 Jul 2018 07:32:01 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1532590310.c03a6d641dd2dce29a98e0cdf6930ab4d3754232.zmedico@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/tini/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/tini/tini-0.18.0.ebuild X-VCS-Directories: sys-process/tini/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c03a6d641dd2dce29a98e0cdf6930ab4d3754232 X-VCS-Branch: master Date: Thu, 26 Jul 2018 07:32:01 +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-Archives-Salt: b4362c53-8d6e-4147-8a2e-11947892edc2 X-Archives-Hash: 24560415d06f8deaf86e72d438183f02 commit: c03a6d641dd2dce29a98e0cdf6930ab4d3754232 Author: Zac Medico gentoo org> AuthorDate: Thu Jul 26 07:29:11 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jul 26 07:31:50 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c03a6d64 sys-process/tini: remove -Werror (bug 626438) Fixes: https://bugs.gentoo.org/626438 Package-Manager: Portage-2.3.43, Repoman-2.3.10 sys-process/tini/tini-0.18.0.ebuild | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sys-process/tini/tini-0.18.0.ebuild b/sys-process/tini/tini-0.18.0.ebuild index 6055c7e98a1..9650f2b376b 100644 --- a/sys-process/tini/tini-0.18.0.ebuild +++ b/sys-process/tini/tini-0.18.0.ebuild @@ -17,8 +17,20 @@ IUSE="+args +static" src_prepare() { cmake-utils_src_prepare - # Do not strip binary - sed -i -e 's/-Wl,-s")$/")/' \ + + local sed_args=( + # Do not strip binary + -e 's/-Wl,-s")$/")/' + + # Remove -Werror and -pedantic-errors in order to allow macro + # redefinition, so that CFLAGS="-U_FORTIFY_SOURCE" does not + # trigger an error due to add_definitions(-D_FORTIFY_SOURCE=2) + # in CMakeLists.txt (bug 626438). + -e "s/ -Werror / /" + -e "s/ -pedantic-errors / /" + ) + + sed -i "${sed_args[@]}" \ -e "s/git.*status --porcelain.*/true/" \ -e "s/git.*log -n 1.*/true/" \ -e "s/git.\${tini_VERSION_GIT}/git.${GIT_COMMIT}/" \