commit: 331b5bbba4bfca44785c3ed7d3f367c8e7ef7621 Author: Yuan Liao <liaoyuan <AT> gmail <DOT> com> AuthorDate: Thu Dec 22 00:06:40 2022 +0000 Commit: Yuan Liao <liaoyuan <AT> gmail <DOT> com> CommitDate: Thu Dec 22 00:36:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=331b5bbb
games-emulation/dosbox-x: Respect user's '-O*' compiler flags Closes: https://bugs.gentoo.org/887669 Signed-off-by: Yuan Liao <liaoyuan <AT> gmail.com> .../{dosbox-x-2022.08.0.ebuild => dosbox-x-2022.08.0-r1.ebuild} | 6 ++++++ ...pre20221210.ebuild => dosbox-x-2022.09.1_pre20221210-r1.ebuild} | 7 +++++++ games-emulation/dosbox-x/dosbox-x-9999.ebuild | 7 +++++++ 3 files changed, 20 insertions(+) diff --git a/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild similarity index 96% rename from games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild rename to games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild index 473948a53..bec3c9a2e 100644 --- a/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild +++ b/games-emulation/dosbox-x/dosbox-x-2022.08.0-r1.ebuild @@ -81,6 +81,12 @@ pkg_pretend() { src_prepare() { default + # https://bugs.gentoo.org/887669 + # Comment out lines touching '-O*', and avoid creating an empty + # command list as a result to not break 'if', 'for', or functions + sed -i -E -e 's/(\s?)((C|CXX)FLAGS=.*-O)/\1: #\2/' configure.ac || + die "Failed to stop configure.ac from touching '-O*' compiler flags" + # Patch command lines like the following in Makefile.am: # -test -x /usr/sbin/setcap && setcap cap_net_raw=ep $(DESTDIR)$(bindir)/dosbox-x # diff --git a/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild similarity index 95% rename from games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210.ebuild rename to games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild index 49f4ea171..9af962aef 100644 --- a/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210.ebuild +++ b/games-emulation/dosbox-x/dosbox-x-2022.09.1_pre20221210-r1.ebuild @@ -88,6 +88,13 @@ pkg_pretend() { src_prepare() { default + + # https://bugs.gentoo.org/887669 + # Comment out lines touching '-O*', and avoid creating an empty + # command list as a result to not break 'if', 'for', or functions + sed -i -E -e 's/(\s?)((C|CXX)FLAGS=.*-O)/\1: #\2/' configure.ac || + die "Failed to stop configure.ac from touching '-O*' compiler flags" + eautoreconf } diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild index e2738549f..39ecd4c1c 100644 --- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild +++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild @@ -88,6 +88,13 @@ pkg_pretend() { src_prepare() { default + + # https://bugs.gentoo.org/887669 + # Comment out lines touching '-O*', and avoid creating an empty + # command list as a result to not break 'if', 'for', or functions + sed -i -E -e 's/(\s?)((C|CXX)FLAGS=.*-O)/\1: #\2/' configure.ac || + die "Failed to stop configure.ac from touching '-O*' compiler flags" + eautoreconf }
