aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdelrahman Sarhan <abdulrahmanayman1@gmail.com>2024-10-22 15:20:32 -0400
committerAbdelrahman Sarhan <abdulrahmanayman1@gmail.com>2024-10-22 15:30:20 -0400
commit17d3645a5bfaacaddbdfd0e80b232f81257de843 (patch)
treec86adf20736a96acfb720a1b4a691a61f2c65285 /games-fps
parentRevert "games-fps/crispy-doom: Fixed configure.ac overwriting CFLAGS and LDFL... (diff)
downloadguru-17d3645a5bfaacaddbdfd0e80b232f81257de843.tar.gz
guru-17d3645a5bfaacaddbdfd0e80b232f81257de843.tar.bz2
guru-17d3645a5bfaacaddbdfd0e80b232f81257de843.zip
games-fps/crispy-doom: Fixed CFLAGS bug
Fixed bug where CFLAGS doesn't respect make.conf settings. Signed-off-by: Abdelrahman Sarhan <abdulrahmanayman1@gmail.com>
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/crispy-doom/crispy-doom-5.12.0.ebuild4
-rw-r--r--games-fps/crispy-doom/crispy-doom-6.0.ebuild4
-rw-r--r--games-fps/crispy-doom/files/crispy-doom-5.12.0-cflags.patch13
-rw-r--r--games-fps/crispy-doom/files/crispy-doom-6.0-cflags.patch11
4 files changed, 32 insertions, 0 deletions
diff --git a/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild b/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild
index 60823967d..51c528c4e 100644
--- a/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild
+++ b/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild
@@ -42,6 +42,10 @@ DOCS=(
"README.Strife.md"
)
+PATCHES=(
+ ${FILESDIR}/${P}-cflags.patch
+)
+
src_prepare() {
default
diff --git a/games-fps/crispy-doom/crispy-doom-6.0.ebuild b/games-fps/crispy-doom/crispy-doom-6.0.ebuild
index f4dfd0191..d10e6f1c3 100644
--- a/games-fps/crispy-doom/crispy-doom-6.0.ebuild
+++ b/games-fps/crispy-doom/crispy-doom-6.0.ebuild
@@ -43,6 +43,10 @@ DOCS=(
"README.Strife.md"
)
+PATCHES=(
+ ${FILESDIR}/${P}-cflags.patch
+)
+
src_prepare() {
default
diff --git a/games-fps/crispy-doom/files/crispy-doom-5.12.0-cflags.patch b/games-fps/crispy-doom/files/crispy-doom-5.12.0-cflags.patch
new file mode 100644
index 000000000..153be493f
--- /dev/null
+++ b/games-fps/crispy-doom/files/crispy-doom-5.12.0-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index e4614a1..5908e1a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -28,7 +28,7 @@ OPT_LEVEL=2
+ if test "$GCC" = "yes"
+ then
+ WARNINGS="-Wall -Wdeclaration-after-statement -Wredundant-decls"
++ CFLAGS="$WARNINGS $orig_CFLAGS"
+- CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS"
+ fi
+
+ PKG_CHECK_MODULES(SDL, [sdl2 >= 2.0.7])
diff --git a/games-fps/crispy-doom/files/crispy-doom-6.0-cflags.patch b/games-fps/crispy-doom/files/crispy-doom-6.0-cflags.patch
new file mode 100644
index 000000000..9d307220d
--- /dev/null
+++ b/games-fps/crispy-doom/files/crispy-doom-6.0-cflags.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2024-10-22 14:32:01.009784223 -0400
++++ b/configure.ac 2024-10-22 14:38:40.706790279 -0400
+@@ -28,7 +28,7 @@
+ if test "$GCC" = "yes"
+ then
+ WARNINGS="-Wall -Wdeclaration-after-statement -Wredundant-decls"
+- CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS"
++ CFLAGS="$WARNINGS $orig_CFLAGS"
+ fi
+
+ PKG_CHECK_MODULES(SDL, [sdl2 >= 2.0.7])