| 1 |
commit: 69101d81e5b71f22cf39afe6cf3a01a2e670ca08 |
| 2 |
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue May 31 23:47:02 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 1 00:10:41 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69101d81 |
| 7 |
|
| 8 |
games-action/polymc: remove some troublesome compile flags |
| 9 |
|
| 10 |
Remove -Werror and -D_FORTIFY_SOURCE from the upstream CMakeLists, to |
| 11 |
prevent breakage with user-defined flags. |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/848765 |
| 14 |
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com> |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/25713 |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
games-action/polymc/polymc-1.3.0.ebuild | 4 ++++ |
| 19 |
games-action/polymc/polymc-1.3.1.ebuild | 4 ++++ |
| 20 |
games-action/polymc/polymc-9999.ebuild | 4 ++++ |
| 21 |
3 files changed, 12 insertions(+) |
| 22 |
|
| 23 |
diff --git a/games-action/polymc/polymc-1.3.0.ebuild b/games-action/polymc/polymc-1.3.0.ebuild |
| 24 |
index abe73ed34f30..1034a30e5df0 100644 |
| 25 |
--- a/games-action/polymc/polymc-1.3.0.ebuild |
| 26 |
+++ b/games-action/polymc/polymc-1.3.0.ebuild |
| 27 |
@@ -79,6 +79,10 @@ RDEPEND=" |
| 28 |
|
| 29 |
src_prepare() { |
| 30 |
cmake_src_prepare |
| 31 |
+ |
| 32 |
+ # Prevent conflicting with the user's flags |
| 33 |
+ # See https://bugs.gentoo.org/848765 for more info |
| 34 |
+ sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed' |
| 35 |
} |
| 36 |
|
| 37 |
src_configure(){ |
| 38 |
|
| 39 |
diff --git a/games-action/polymc/polymc-1.3.1.ebuild b/games-action/polymc/polymc-1.3.1.ebuild |
| 40 |
index abe73ed34f30..1034a30e5df0 100644 |
| 41 |
--- a/games-action/polymc/polymc-1.3.1.ebuild |
| 42 |
+++ b/games-action/polymc/polymc-1.3.1.ebuild |
| 43 |
@@ -79,6 +79,10 @@ RDEPEND=" |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
cmake_src_prepare |
| 47 |
+ |
| 48 |
+ # Prevent conflicting with the user's flags |
| 49 |
+ # See https://bugs.gentoo.org/848765 for more info |
| 50 |
+ sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed' |
| 51 |
} |
| 52 |
|
| 53 |
src_configure(){ |
| 54 |
|
| 55 |
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild |
| 56 |
index abe73ed34f30..1034a30e5df0 100644 |
| 57 |
--- a/games-action/polymc/polymc-9999.ebuild |
| 58 |
+++ b/games-action/polymc/polymc-9999.ebuild |
| 59 |
@@ -79,6 +79,10 @@ RDEPEND=" |
| 60 |
|
| 61 |
src_prepare() { |
| 62 |
cmake_src_prepare |
| 63 |
+ |
| 64 |
+ # Prevent conflicting with the user's flags |
| 65 |
+ # See https://bugs.gentoo.org/848765 for more info |
| 66 |
+ sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed' |
| 67 |
} |
| 68 |
|
| 69 |
src_configure(){ |
Archives