| 1 |
commit: 82d2ff05ea04217bfcd504e9066c902f0ce3a6f6 |
| 2 |
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
| 3 |
AuthorDate: Fri Apr 30 03:15:34 2021 +0000 |
| 4 |
Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
| 5 |
CommitDate: Fri Apr 30 03:15:34 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=82d2ff05 |
| 7 |
|
| 8 |
games-action/blackvoxel: drop -zrelro ldflag |
| 9 |
|
| 10 |
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr> |
| 11 |
|
| 12 |
games-action/blackvoxel/blackvoxel-9999.ebuild | 5 +++-- |
| 13 |
games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch | 2 +- |
| 14 |
2 files changed, 4 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/games-action/blackvoxel/blackvoxel-9999.ebuild b/games-action/blackvoxel/blackvoxel-9999.ebuild |
| 17 |
index b52f4b8b1..d20271cef 100644 |
| 18 |
--- a/games-action/blackvoxel/blackvoxel-9999.ebuild |
| 19 |
+++ b/games-action/blackvoxel/blackvoxel-9999.ebuild |
| 20 |
@@ -27,9 +27,10 @@ RDEPEND="${DEPEND}" |
| 21 |
src_prepare() { |
| 22 |
sed -i -e '/COMPILEOPTION_SAVEFOLDERNAME/s:Blackvoxel:.local/share/blackvoxel:' \ |
| 23 |
src/ACompileSettings.h || die |
| 24 |
- sed -i -e 's/LDFLAGS=/LDFLAGS+= /' -e 's/LDFLAGS/s/-s //' \ |
| 25 |
+ sed -i -e 's/LDFLAGS=/LDFLAGS+= /' -e '/LDFLAGS/s/-s -zrelro //' \ |
| 26 |
-e '/(CPU_BITS)/ { s/; make //; s/cd/+make -C/}' \ |
| 27 |
- -e '/CFLAGS+/d' -e 's/CFLAGS=/CFLAGS+=/' Makefile || die |
| 28 |
+ -e '/CFLAGS+/d' -e 's/CFLAGS=/CFLAGS+=/' \ |
| 29 |
+ Makefile || die |
| 30 |
default |
| 31 |
} |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch |
| 35 |
index 5ce5184b4..c8e826c68 100644 |
| 36 |
--- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch |
| 37 |
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch |
| 38 |
@@ -15,7 +15,7 @@ |
| 39 |
ifeq ($(KERNELNAME),Linux) |
| 40 |
- CFLAGS+= -O3 -c -fmessage-length=0 |
| 41 |
- LDFLAGS=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 42 |
-+ LDFLAGS+= -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 43 |
++ LDFLAGS+= -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 44 |
else ifeq ($(KERNELNAME), FreeBSD) |
| 45 |
# To be done... |
| 46 |
CFLAGS+= -O3 -c -fmessage-length=0 |
Archives