* [gentoo-commits] repo/proj/guru:dev commit in: games-fps/crispy-doom/files/, games-fps/crispy-doom/
@ 2024-10-22 19:30 Abdelrahman Sarhan
0 siblings, 0 replies; 2+ messages in thread
From: Abdelrahman Sarhan @ 2024-10-22 19:30 UTC (permalink / raw
To: gentoo-commits
commit: 22675716b657068927acfe05d946edcbe988aead
Author: Abdelrahman Sarhan <abdulrahmanayman1 <AT> gmail <DOT> com>
AuthorDate: Tue Oct 22 18:36:06 2024 +0000
Commit: Abdelrahman Sarhan <abdulrahmanayman1 <AT> gmail <DOT> com>
CommitDate: Tue Oct 22 19:30:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=22675716
Revert "games-fps/crispy-doom: Fixed configure.ac overwriting CFLAGS and LDFLAGS"
Found a better fix.
This reverts commit 2aee9b2b00201ad5cd25b44e803e1d93c63c86ed.
Signed-off-by: Abdelrahman Sarhan <abdulrahmanayman1 <AT> gmail.com>
games-fps/crispy-doom/crispy-doom-5.12.0.ebuild | 4 ----
games-fps/crispy-doom/crispy-doom-6.0.ebuild | 4 ----
.../crispy-doom/files/crispy-doom-5.12.0-makeopts.patch | 15 ---------------
.../crispy-doom/files/crispy-doom-6.0-makeopts.patch | 15 ---------------
4 files changed, 38 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 61c3883e0..60823967d 100644
--- a/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild
+++ b/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild
@@ -50,10 +50,6 @@ src_prepare() {
eautoreconf
}
-PATCHES=(
- "${FILESDIR}"/${P}-makeopts.patch
-)
-
src_configure() {
econf \
--enable-bash-completion \
diff --git a/games-fps/crispy-doom/crispy-doom-6.0.ebuild b/games-fps/crispy-doom/crispy-doom-6.0.ebuild
index ede240fb3..f4dfd0191 100644
--- a/games-fps/crispy-doom/crispy-doom-6.0.ebuild
+++ b/games-fps/crispy-doom/crispy-doom-6.0.ebuild
@@ -43,10 +43,6 @@ DOCS=(
"README.Strife.md"
)
-PATCHES=(
- "${FILESDIR}"/"${P}"-makeopts.patch
-)
-
src_prepare() {
default
diff --git a/games-fps/crispy-doom/files/crispy-doom-5.12.0-makeopts.patch b/games-fps/crispy-doom/files/crispy-doom-5.12.0-makeopts.patch
deleted file mode 100644
index 876ab1898..000000000
--- a/games-fps/crispy-doom/files/crispy-doom-5.12.0-makeopts.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.ac 2024-10-21 18:54:07.483980753 -0400
-+++ b/configure.ac 2024-10-21 18:54:52.224330577 -0400
-@@ -166,8 +166,10 @@
-
- # TODO: We currently link everything against libraries that don't need it.
- # Use the specific library CFLAGS/LIBS variables instead of setting them here.
--CFLAGS="$CFLAGS $SDL_CFLAGS ${SAMPLERATE_CFLAGS:-} ${PNG_CFLAGS:-} ${LIBZ_CFLAGS:-}"
--LDFLAGS="$LDFLAGS $SDL_LIBS ${SAMPLERATE_LIBS:-} ${PNG_LIBS:-} ${LIBZ_LIBS:-}"
-+UCFLAGS:=$(shell emerge --info | grep CFLAGS=".*" | cut -d'"' -f2)
-+ULDFLAGS:=$(shell emerge --info | grep LDFLAGS=".*" | cut -d'"' -f2)
-+CFLAGS+="$UCFLAGS $SDL_CFLAGS ${SAMPLERATE_CFLAGS:-} ${PNG_CFLAGS:-} ${LIBZ_CFLAGS:-}"
-+LDFLAGS+="$ULDFLAGS $SDL_LIBS ${SAMPLERATE_LIBS:-} ${PNG_LIBS:-} ${LIBZ_LIBS:-}"
- case "$host" in
- *-*-mingw* | *-*-cygwin* | *-*-msvc* )
- LDFLAGS="$LDFLAGS -lwinmm"
diff --git a/games-fps/crispy-doom/files/crispy-doom-6.0-makeopts.patch b/games-fps/crispy-doom/files/crispy-doom-6.0-makeopts.patch
deleted file mode 100644
index 4e4d72d3f..000000000
--- a/games-fps/crispy-doom/files/crispy-doom-6.0-makeopts.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.ac 2023-03-31 16:42:24.000000000 -0400
-+++ b/configure.ac 2024-10-21 19:11:20.577093421 -0400
-@@ -184,8 +184,10 @@
-
- # TODO: We currently link everything against libraries that don't need it.
- # Use the specific library CFLAGS/LIBS variables instead of setting them here.
--CFLAGS="$CFLAGS $SDL_CFLAGS ${SAMPLERATE_CFLAGS:-} ${PNG_CFLAGS:-} ${FLUIDSYNTH_CFLAGS:-} ${LIBZ_CFLAGS:-}"
--LDFLAGS="$LDFLAGS $SDL_LIBS ${SAMPLERATE_LIBS:-} ${PNG_LIBS:-} ${FLUIDSYNTH_LIBS:-} ${LIBZ_LIBS:-}"
-+UCFLAGS:=$(shell emerge --info | grep CFLAGS=".*" | cut -d'"' -f2)
-+ULDFLAGS:=$(shell emerge --info | grep LDFLAGS=".*" | cut -d'"' -f2)
-+CFLAGS+="$UCFLAGS $SDL_CFLAGS ${SAMPLERATE_CFLAGS:-} ${PNG_CFLAGS:-} ${LIBZ_CFLAGS:-}"
-+LDFLAGS+="$ULDFLAGS $SDL_LIBS ${SAMPLERATE_LIBS:-} ${PNG_LIBS:-} ${LIBZ_LIBS:-}"
- case "$host" in
- *-*-mingw* | *-*-cygwin* | *-*-msvc* )
- LDFLAGS="$LDFLAGS -lwinmm"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-fps/crispy-doom/files/, games-fps/crispy-doom/
@ 2024-10-22 19:30 Abdelrahman Sarhan
0 siblings, 0 replies; 2+ messages in thread
From: Abdelrahman Sarhan @ 2024-10-22 19:30 UTC (permalink / raw
To: gentoo-commits
commit: 17d3645a5bfaacaddbdfd0e80b232f81257de843
Author: Abdelrahman Sarhan <abdulrahmanayman1 <AT> gmail <DOT> com>
AuthorDate: Tue Oct 22 19:20:32 2024 +0000
Commit: Abdelrahman Sarhan <abdulrahmanayman1 <AT> gmail <DOT> com>
CommitDate: Tue Oct 22 19:30:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=17d3645a
games-fps/crispy-doom: Fixed CFLAGS bug
Fixed bug where CFLAGS doesn't respect make.conf settings.
Signed-off-by: Abdelrahman Sarhan <abdulrahmanayman1 <AT> gmail.com>
games-fps/crispy-doom/crispy-doom-5.12.0.ebuild | 4 ++++
games-fps/crispy-doom/crispy-doom-6.0.ebuild | 4 ++++
games-fps/crispy-doom/files/crispy-doom-5.12.0-cflags.patch | 13 +++++++++++++
games-fps/crispy-doom/files/crispy-doom-6.0-cflags.patch | 11 +++++++++++
4 files changed, 32 insertions(+)
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])
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-10-22 19:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-22 19:30 [gentoo-commits] repo/proj/guru:dev commit in: games-fps/crispy-doom/files/, games-fps/crispy-doom/ Abdelrahman Sarhan
-- strict thread matches above, loose matches on Subject: below --
2024-10-22 19:30 Abdelrahman Sarhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox