commit: 4b38ffa0071c0a2ac4ed4382e092c0eb8caa2a1f
Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
AuthorDate: Mon May 3 20:35:17 2021 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Mon May 3 20:36:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4b38ffa0
games-action/blackvoxel: Re-add jobserver-tweak to patch.
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
.../blackvoxel/files/blackvoxel-2.42-makefile.patch | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
index de29e1999..ba800e827 100644
--- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch
@@ -1,4 +1,4 @@
-From 6f28e09bf6c8b48e0b1e7acc8b755e076e41fe40 Mon Sep 17 00:00:00 2001
+From 18ae2cca1ef8b9e04b463719d03b021245ecfeec Mon Sep 17 00:00:00 2001
From: tastytea <tasty...@tastytea.de>
Date: Mon, 3 May 2021 21:21:25 +0200
Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with
@@ -6,14 +6,14 @@ Subject: [PATCH] Don't overwrite build-flags, replace
hardcoded tools with
Also remove -zrelro from LDFLAGS.
---
- Makefile | 29 ++++++++++++++---------------
+ Makefile | 31 +++++++++++++++---------------
src/sc_Squirrel3/sq/Makefile | 8 ++++----
- src/sc_Squirrel3/sqstdlib/Makefile | 16 ++++++++--------
- src/sc_Squirrel3/squirrel/Makefile | 16 ++++++++--------
- 4 files changed, 34 insertions(+), 35 deletions(-)
+ src/sc_Squirrel3/sqstdlib/Makefile | 16 +++++++--------
+ src/sc_Squirrel3/squirrel/Makefile | 16 +++++++--------
+ 4 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/Makefile b/Makefile
-index 3fac7f3..62c50cb 100644
+index 3fac7f3..d1104e7 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,9 @@ ifndef bindir
@@ -40,7 +40,7 @@ index 3fac7f3..62c50cb 100644
else
# Unix like operating systems
CPU_BITS= $(shell getconf LONG_BIT)
-@@ -28,31 +27,31 @@ else
+@@ -28,36 +27,36 @@ else
KERNELNAME =$(shell uname -s)
ifeq ($(KERNELNAME),Linux)
@@ -82,6 +82,12 @@ index 3fac7f3..62c50cb 100644
+ squirrel:
+- cd src/sc_Squirrel3 ; make sq$(CPU_BITS)
++ +make -C src/sc_Squirrel3 sq$(CPU_BITS)
+
+ clean:
+ @rm -rf obj
diff --git a/src/sc_Squirrel3/sq/Makefile b/src/sc_Squirrel3/sq/Makefile
index c2cfc7e..08fb2ef 100644
--- a/src/sc_Squirrel3/sq/Makefile
