From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C653158042 for ; Tue, 22 Oct 2024 09:32:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CEC63E0918; Tue, 22 Oct 2024 09:32:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2009E08FA for ; Tue, 22 Oct 2024 09:32:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CCE27343093 for ; Tue, 22 Oct 2024 09:32:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 356852468 for ; Tue, 22 Oct 2024 09:31:57 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1729554028.2aee9b2b00201ad5cd25b44e803e1d93c63c86ed.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: games-fps/crispy-doom/, games-fps/crispy-doom/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: games-fps/crispy-doom/crispy-doom-5.12.0.ebuild games-fps/crispy-doom/crispy-doom-6.0.ebuild games-fps/crispy-doom/files/crispy-doom-5.12.0-makeopts.patch games-fps/crispy-doom/files/crispy-doom-6.0-makeopts.patch X-VCS-Directories: games-fps/crispy-doom/files/ games-fps/crispy-doom/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: 2aee9b2b00201ad5cd25b44e803e1d93c63c86ed X-VCS-Branch: master Date: Tue, 22 Oct 2024 09:31:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e8d03f1a-a127-49f1-88a1-4e32f71efbfb X-Archives-Hash: 77729cf7792bee46006b66296fa63f2d commit: 2aee9b2b00201ad5cd25b44e803e1d93c63c86ed Author: Abdelrahman Sarhan gmail com> AuthorDate: Mon Oct 21 23:40:28 2024 +0000 Commit: David Roman gmail com> CommitDate: Mon Oct 21 23:40:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2aee9b2b games-fps/crispy-doom: Fixed configure.ac overwriting CFLAGS and LDFLAGS Signed-off-by: Abdelrahman Sarhan 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 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..61c3883e0 100644 --- a/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild +++ b/games-fps/crispy-doom/crispy-doom-5.12.0.ebuild @@ -50,6 +50,10 @@ 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 f4dfd0191..ede240fb3 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}"-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 new file mode 100644 index 000000000..876ab1898 --- /dev/null +++ b/games-fps/crispy-doom/files/crispy-doom-5.12.0-makeopts.patch @@ -0,0 +1,15 @@ +--- 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 new file mode 100644 index 000000000..4e4d72d3f --- /dev/null +++ b/games-fps/crispy-doom/files/crispy-doom-6.0-makeopts.patch @@ -0,0 +1,15 @@ +--- 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"