diff options
| author |   Ronny (tastytea) Gutbrod <gentoo@tastytea.de> | 2021-05-03 21:28:13 +0200 |
|---|---|---|
| committer | Ronny (tastytea) Gutbrod <gentoo@tastytea.de> | 2021-05-03 21:28:13 +0200 |
| commit | 82c53fd72093f405e8efe0f3904f9a51a4663f94 (patch) | |
| tree | 3059f67d4356a16148fc1db5a5d629715adaada0 /games-action | |
| parent | media-video/jellyfin-desktop: bump to 2.0.1 (diff) | |
| download | guru-82c53fd72093f405e8efe0f3904f9a51a4663f94.tar.gz guru-82c53fd72093f405e8efe0f3904f9a51a4663f94.tar.bz2 guru-82c53fd72093f405e8efe0f3904f9a51a4663f94.zip | |
games-action/blackvoxel: Remove -zrelro again.
I overlooked it when I extended the Makefile-patch before.
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo@tastytea.de>
Diffstat (limited to 'games-action')
| -rw-r--r-- | games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch | 12 | ||||
| -rw-r--r-- | games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch | 9 |
2 files changed, 11 insertions, 10 deletions
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 index 7be84fbbf..85f2b1290 100644 --- a/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch +++ b/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch @@ -1,6 +1,6 @@ -From b6baebbd17479d9b6f6083797fa4eb63741fa52b Mon Sep 17 00:00:00 2001 +From a68c7c2d10bed88a5148828b6f8f02175af696ca Mon Sep 17 00:00:00 2001 From: tastytea <tastytea@tastytea.de> -Date: Mon, 3 May 2021 03:05:19 +0200 +Date: Mon, 3 May 2021 21:25:36 +0200 Subject: [PATCH] Don't strip files. --- @@ -9,7 +9,7 @@ Subject: [PATCH] Don't strip files. 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile -index a85dd7e..51cb0fd 100644 +index 62c50cb..57f27d4 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ OBJ= $(SRC:src/%.cpp=obj/%.o) @@ -25,13 +25,13 @@ index a85dd7e..51cb0fd 100644 ifeq ($(KERNELNAME),Linux) CXXFLAGS+= -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+=-s -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 - LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib -+ LDFLAGS+=-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), Darwin) CXXFLAGS+= -O3 -c -fmessage-length=0 - 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 diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch index f6f857212..de29e1999 100644 --- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch +++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch @@ -1,9 +1,10 @@ -From a4fbc416e1c9884353f743f84ca98207f792b502 Mon Sep 17 00:00:00 2001 +From 6f28e09bf6c8b48e0b1e7acc8b755e076e41fe40 Mon Sep 17 00:00:00 2001 From: tastytea <tastytea@tastytea.de> -Date: Mon, 3 May 2021 02:26:12 +0200 +Date: Mon, 3 May 2021 21:21:25 +0200 Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with variables. +Also remove -zrelro from LDFLAGS. --- Makefile | 29 ++++++++++++++--------------- src/sc_Squirrel3/sq/Makefile | 8 ++++---- @@ -12,7 +13,7 @@ Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with 4 files changed, 34 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile -index 3fac7f3..a85dd7e 100644 +index 3fac7f3..62c50cb 100644 --- a/Makefile +++ b/Makefile @@ -8,10 +8,9 @@ ifndef bindir @@ -46,7 +47,7 @@ index 3fac7f3..a85dd7e 100644 - CFLAGS+= -O3 -c -fmessage-length=0 - LDFLAGS=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib + CXXFLAGS+= -O3 -c -fmessage-length=0 -+ LDFLAGS+=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib ++ LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib else ifeq ($(KERNELNAME), FreeBSD) # To be done... - CFLAGS+= -O3 -c -fmessage-length=0 |