commit:     69101d81e5b71f22cf39afe6cf3a01a2e670ca08
Author:     Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Tue May 31 23:47:02 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 00:10:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69101d81

games-action/polymc: remove some troublesome compile flags

Remove -Werror and -D_FORTIFY_SOURCE from the upstream CMakeLists, to
prevent breakage with user-defined flags.

Closes: https://bugs.gentoo.org/848765
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25713
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-action/polymc/polymc-1.3.0.ebuild | 4 ++++
 games-action/polymc/polymc-1.3.1.ebuild | 4 ++++
 games-action/polymc/polymc-9999.ebuild  | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/games-action/polymc/polymc-1.3.0.ebuild 
b/games-action/polymc/polymc-1.3.0.ebuild
index abe73ed34f30..1034a30e5df0 100644
--- a/games-action/polymc/polymc-1.3.0.ebuild
+++ b/games-action/polymc/polymc-1.3.0.ebuild
@@ -79,6 +79,10 @@ RDEPEND="
 
 src_prepare() {
        cmake_src_prepare
+
+       # Prevent conflicting with the user's flags
+       # See https://bugs.gentoo.org/848765 for more info
+       sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || 
die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
 }
 
 src_configure(){

diff --git a/games-action/polymc/polymc-1.3.1.ebuild 
b/games-action/polymc/polymc-1.3.1.ebuild
index abe73ed34f30..1034a30e5df0 100644
--- a/games-action/polymc/polymc-1.3.1.ebuild
+++ b/games-action/polymc/polymc-1.3.1.ebuild
@@ -79,6 +79,10 @@ RDEPEND="
 
 src_prepare() {
        cmake_src_prepare
+
+       # Prevent conflicting with the user's flags
+       # See https://bugs.gentoo.org/848765 for more info
+       sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || 
die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
 }
 
 src_configure(){

diff --git a/games-action/polymc/polymc-9999.ebuild 
b/games-action/polymc/polymc-9999.ebuild
index abe73ed34f30..1034a30e5df0 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -79,6 +79,10 @@ RDEPEND="
 
 src_prepare() {
        cmake_src_prepare
+
+       # Prevent conflicting with the user's flags
+       # See https://bugs.gentoo.org/848765 for more info
+       sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || 
die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
 }
 
 src_configure(){

Reply via email to