[gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/, games-action/blackvoxel/files/

[Samuel Bauer]

commit:     82d2ff05ea04217bfcd504e9066c902f0ce3a6f6
Author:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
AuthorDate: Fri Apr 30 03:15:34 2021 +0000
Commit:     Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr>
CommitDate: Fri Apr 30 03:15:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=82d2ff05

games-action/blackvoxel: drop -zrelro ldflag

Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr>

 games-action/blackvoxel/blackvoxel-9999.ebuild               | 5 +++--
 games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/games-action/blackvoxel/blackvoxel-9999.ebuild 
b/games-action/blackvoxel/blackvoxel-9999.ebuild
index b52f4b8b1..d20271cef 100644
--- a/games-action/blackvoxel/blackvoxel-9999.ebuild
+++ b/games-action/blackvoxel/blackvoxel-9999.ebuild
@@ -27,9 +27,10 @@ RDEPEND="${DEPEND}"
 src_prepare() {
        sed -i -e 
'/COMPILEOPTION_SAVEFOLDERNAME/s:Blackvoxel:.local/share/blackvoxel:' \
                src/ACompileSettings.h || die
-       sed -i -e 's/LDFLAGS=/LDFLAGS+= /' -e 's/LDFLAGS/s/-s //' \
+       sed -i -e 's/LDFLAGS=/LDFLAGS+= /' -e '/LDFLAGS/s/-s -zrelro //' \
                -e '/(CPU_BITS)/ { s/; make //; s/cd/+make -C/}' \
-               -e '/CFLAGS+/d' -e 's/CFLAGS=/CFLAGS+=/' Makefile || die
+               -e '/CFLAGS+/d' -e 's/CFLAGS=/CFLAGS+=/' \
+               Makefile || die
        default
 }
 

diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch 
b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
index 5ce5184b4..c8e826c68 100644
--- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
@@ -15,7 +15,7 @@
    ifeq ($(KERNELNAME),Linux)
 -    CFLAGS+= -O3 -c -fmessage-length=0
 -    LDFLAGS=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL 
-lsquirrel -lsqstdlib
-+    LDFLAGS+= -zrelro -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...
      CFLAGS+= -O3 -c -fmessage-length=0