| 1 |
commit: c03a6d641dd2dce29a98e0cdf6930ab4d3754232 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 26 07:29:11 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 26 07:31:50 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c03a6d64 |
| 7 |
|
| 8 |
sys-process/tini: remove -Werror (bug 626438) |
| 9 |
|
| 10 |
Fixes: https://bugs.gentoo.org/626438 |
| 11 |
Package-Manager: Portage-2.3.43, Repoman-2.3.10 |
| 12 |
|
| 13 |
sys-process/tini/tini-0.18.0.ebuild | 16 ++++++++++++++-- |
| 14 |
1 file changed, 14 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-process/tini/tini-0.18.0.ebuild b/sys-process/tini/tini-0.18.0.ebuild |
| 17 |
index 6055c7e98a1..9650f2b376b 100644 |
| 18 |
--- a/sys-process/tini/tini-0.18.0.ebuild |
| 19 |
+++ b/sys-process/tini/tini-0.18.0.ebuild |
| 20 |
@@ -17,8 +17,20 @@ IUSE="+args +static" |
| 21 |
|
| 22 |
src_prepare() { |
| 23 |
cmake-utils_src_prepare |
| 24 |
- # Do not strip binary |
| 25 |
- sed -i -e 's/-Wl,-s")$/")/' \ |
| 26 |
+ |
| 27 |
+ local sed_args=( |
| 28 |
+ # Do not strip binary |
| 29 |
+ -e 's/-Wl,-s")$/")/' |
| 30 |
+ |
| 31 |
+ # Remove -Werror and -pedantic-errors in order to allow macro |
| 32 |
+ # redefinition, so that CFLAGS="-U_FORTIFY_SOURCE" does not |
| 33 |
+ # trigger an error due to add_definitions(-D_FORTIFY_SOURCE=2) |
| 34 |
+ # in CMakeLists.txt (bug 626438). |
| 35 |
+ -e "s/ -Werror / /" |
| 36 |
+ -e "s/ -pedantic-errors / /" |
| 37 |
+ ) |
| 38 |
+ |
| 39 |
+ sed -i "${sed_args[@]}" \ |
| 40 |
-e "s/git.*status --porcelain.*/true/" \ |
| 41 |
-e "s/git.*log -n 1.*/true/" \ |
| 42 |
-e "s/git.\${tini_VERSION_GIT}/git.${GIT_COMMIT}/" \ |
Archives