commit: 22675716b657068927acfe05d946edcbe988aead
Author: Abdelrahman Sarhan <abdulrahmanayman1 <AT> gmail <DOT> com>
AuthorDate: Tue Oct 22 18:36:06 2024 +0000
Commit: David Roman <davidroman96 <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"
