mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-04-07 03:10:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "games-fps/crispy-doom: Fixed configure.ac overwriting CFLAGS and LDFLAGS"

Browse Source 
Found a better fix.
This reverts commit 2aee9b2b00.

Signed-off-by: Abdelrahman Sarhan <abdulrahmanayman1@gmail.com>
This commit is contained in:
Abdelrahman Sarhan
2024-10-22 14:36:06 -04:00
parent bdfd630d12
commit 22675716b6
4 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
games-fps/crispy-doom/crispy-doom-5.12.0.ebuild
View File

@@ -50,10 +50,6 @@ src_prepare() {
eautoreconf
}
PATCHES=(
"${FILESDIR}"/${P}-makeopts.patch
)
src_configure() {
econf \
--enable-bash-completion \

4
games-fps/crispy-doom/crispy-doom-6.0.ebuild
View File

@@ -43,10 +43,6 @@ DOCS=(
"README.Strife.md"
)
PATCHES=(
"${FILESDIR}"/"${P}"-makeopts.patch
)
src_prepare() {
default

15
games-fps/crispy-doom/files/crispy-doom-5.12.0-makeopts.patch
View File

@@ -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"

15
games-fps/crispy-doom/files/crispy-doom-6.0-makeopts.patch
View File

@@ -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"