| 1 |
commit: 82c53fd72093f405e8efe0f3904f9a51a4663f94 |
| 2 |
Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de> |
| 3 |
AuthorDate: Mon May 3 19:28:13 2021 +0000 |
| 4 |
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de> |
| 5 |
CommitDate: Mon May 3 19:28:13 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=82c53fd7 |
| 7 |
|
| 8 |
games-action/blackvoxel: Remove -zrelro again. |
| 9 |
|
| 10 |
I overlooked it when I extended the Makefile-patch before. |
| 11 |
|
| 12 |
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de> |
| 13 |
|
| 14 |
.../blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch | 12 ++++++------ |
| 15 |
games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch | 9 +++++---- |
| 16 |
2 files changed, 11 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch b/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch |
| 19 |
index 7be84fbbf..85f2b1290 100644 |
| 20 |
--- a/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch |
| 21 |
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
-From b6baebbd17479d9b6f6083797fa4eb63741fa52b Mon Sep 17 00:00:00 2001 |
| 24 |
+From a68c7c2d10bed88a5148828b6f8f02175af696ca Mon Sep 17 00:00:00 2001 |
| 25 |
From: tastytea <tastytea@××××××××.de> |
| 26 |
-Date: Mon, 3 May 2021 03:05:19 +0200 |
| 27 |
+Date: Mon, 3 May 2021 21:25:36 +0200 |
| 28 |
Subject: [PATCH] Don't strip files. |
| 29 |
|
| 30 |
--- |
| 31 |
@@ -9,7 +9,7 @@ Subject: [PATCH] Don't strip files. |
| 32 |
2 files changed, 7 insertions(+), 7 deletions(-) |
| 33 |
|
| 34 |
diff --git a/Makefile b/Makefile |
| 35 |
-index a85dd7e..51cb0fd 100644 |
| 36 |
+index 62c50cb..57f27d4 100644 |
| 37 |
--- a/Makefile |
| 38 |
+++ b/Makefile |
| 39 |
@@ -19,7 +19,7 @@ OBJ= $(SRC:src/%.cpp=obj/%.o) |
| 40 |
@@ -25,13 +25,13 @@ index a85dd7e..51cb0fd 100644 |
| 41 |
|
| 42 |
ifeq ($(KERNELNAME),Linux) |
| 43 |
CXXFLAGS+= -O3 -c -fmessage-length=0 |
| 44 |
-- LDFLAGS+=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 45 |
-+ LDFLAGS+=-zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 46 |
+- LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 47 |
++ LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 48 |
else ifeq ($(KERNELNAME), FreeBSD) |
| 49 |
# To be done... |
| 50 |
CXXFLAGS+= -O3 -c -fmessage-length=0 |
| 51 |
- LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 52 |
-+ LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 53 |
++ LDFLAGS+= -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 54 |
else ifeq ($(KERNELNAME), Darwin) |
| 55 |
CXXFLAGS+= -O3 -c -fmessage-length=0 |
| 56 |
- LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -L"/usr/local/Cellar/glew" -L"/usr/local/Cellar/sdl" -I"/usr/local/Cellar/glew" -I"/usr/local/Cellar/sdl" -framework Cocoa -framework OpenGL -lSDLmain -lSDL -lGLEW -lsquirrel -lsqstdlib |
| 57 |
|
| 58 |
diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch |
| 59 |
index f6f857212..de29e1999 100644 |
| 60 |
--- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch |
| 61 |
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch |
| 62 |
@@ -1,9 +1,10 @@ |
| 63 |
-From a4fbc416e1c9884353f743f84ca98207f792b502 Mon Sep 17 00:00:00 2001 |
| 64 |
+From 6f28e09bf6c8b48e0b1e7acc8b755e076e41fe40 Mon Sep 17 00:00:00 2001 |
| 65 |
From: tastytea <tastytea@××××××××.de> |
| 66 |
-Date: Mon, 3 May 2021 02:26:12 +0200 |
| 67 |
+Date: Mon, 3 May 2021 21:21:25 +0200 |
| 68 |
Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with |
| 69 |
variables. |
| 70 |
|
| 71 |
+Also remove -zrelro from LDFLAGS. |
| 72 |
--- |
| 73 |
Makefile | 29 ++++++++++++++--------------- |
| 74 |
src/sc_Squirrel3/sq/Makefile | 8 ++++---- |
| 75 |
@@ -12,7 +13,7 @@ Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with |
| 76 |
4 files changed, 34 insertions(+), 35 deletions(-) |
| 77 |
|
| 78 |
diff --git a/Makefile b/Makefile |
| 79 |
-index 3fac7f3..a85dd7e 100644 |
| 80 |
+index 3fac7f3..62c50cb 100644 |
| 81 |
--- a/Makefile |
| 82 |
+++ b/Makefile |
| 83 |
@@ -8,10 +8,9 @@ ifndef bindir |
| 84 |
@@ -46,7 +47,7 @@ index 3fac7f3..a85dd7e 100644 |
| 85 |
- CFLAGS+= -O3 -c -fmessage-length=0 |
| 86 |
- LDFLAGS=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 87 |
+ CXXFLAGS+= -O3 -c -fmessage-length=0 |
| 88 |
-+ LDFLAGS+=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 89 |
++ LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib |
| 90 |
else ifeq ($(KERNELNAME), FreeBSD) |
| 91 |
# To be done... |
| 92 |
- CFLAGS+= -O3 -c -fmessage-length=0 |
Archives