commit:     37432fa0182129180bd122f31b85df320b5fa7d7
Author:     Abdelrahman Sarhan <abdulrahmanayman1 <AT> gmail <DOT> com>
AuthorDate: Mon Oct 21 22:06:21 2024 +0000
Commit:     Abdelrahman Sarhan <abdulrahmanayman1 <AT> gmail <DOT> com>
CommitDate: Mon Oct 21 22:06:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=37432fa0

games-action/blackvoxel:-Werror=strict-aliasing & makeopts patch fix

Closes: https://bugs.gentoo.org/862780
Signed-off-by: Abdelrahman Sarhan <abdulrahmanayman1 <AT> gmail.com>

 games-action/blackvoxel/blackvoxel-2.50.ebuild                   | 2 +-
 ...ct-aliasing.patch => blackvoxel-2.50-backported-ltofix.patch} | 0
 games-action/blackvoxel/files/blackvoxel-2.50-makeopts.patch     | 9 +++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/games-action/blackvoxel/blackvoxel-2.50.ebuild 
b/games-action/blackvoxel/blackvoxel-2.50.ebuild
index bb7e7e7fb..16a152193 100644
--- a/games-action/blackvoxel/blackvoxel-2.50.ebuild
+++ b/games-action/blackvoxel/blackvoxel-2.50.ebuild
@@ -29,7 +29,7 @@ PATCHES=(
        "${FILESDIR}"/${P}-makefile.patch
        "${FILESDIR}"/${P}-makeopts.patch
        "${FILESDIR}"/${P}-savedir.patch
-       "${FILESDIR}"/${P}-strict-aliasing.patch
+       "${FILESDIR}"/${P}-backported-ltofix.patch #For ver. 2.50 Remove for 
next ver.
 )
 
 src_compile() {

diff --git 
a/games-action/blackvoxel/files/blackvoxel-2.50-strict-aliasing.patch 
b/games-action/blackvoxel/files/blackvoxel-2.50-backported-ltofix.patch
similarity index 100%
rename from games-action/blackvoxel/files/blackvoxel-2.50-strict-aliasing.patch
rename to games-action/blackvoxel/files/blackvoxel-2.50-backported-ltofix.patch

diff --git a/games-action/blackvoxel/files/blackvoxel-2.50-makeopts.patch 
b/games-action/blackvoxel/files/blackvoxel-2.50-makeopts.patch
index 05a14881c..078d3ce64 100644
--- a/games-action/blackvoxel/files/blackvoxel-2.50-makeopts.patch
+++ b/games-action/blackvoxel/files/blackvoxel-2.50-makeopts.patch
@@ -1,14 +1,15 @@
---- a/Makefile
-+++ b/Makefile
-@@ -64,7 +64,9 @@
+--- a/Makefile 2024-10-21 17:33:29.782931946 -0400
++++ b/Makefile 2024-10-21 17:35:55.202026636 -0400
+@@ -64,8 +64,10 @@
    KERNELNAME =$(shell uname -s)
  
    ifeq ($(KERNELNAME),Linux)
 -    CXXFLAGS+= -O3 -c -fmessage-length=0
+-    LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
 +    UCXXFLAGS:= $(shell emerge --info | grep -w CXXFLAGS=".*" | cut -d '"' 
-f2)
 +    CXXFLAGS+= $(UCXXFLAGS) -c -fmessage-length=0 
 +    ULDFLAGS:= $(shell emerge --info | grep -w LDFLAGS=".*" | cut -d '"' -f2)
 +    LDFLAGS+= $(ULDFLAGS) -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL 
-lsquirrel -lsqstdlib
--    LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel 
-lsqstdlib
    else ifeq ($(KERNELNAME), FreeBSD)
      # To be done...
+     CXXFLAGS+= -O3 -c -fmessage-length=0

Reply via email to