commit:     c03a6d641dd2dce29a98e0cdf6930ab4d3754232
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 26 07:29:11 2018 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> 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}/" \

Reply via email to