games-action/blackvoxel: Re-add jobserver-tweak to patch.

Signed-off-by: Ronny (tastytea) Gutbrod <gentoo@tastytea.de>
This commit is contained in:
Ronny (tastytea) Gutbrod
2021-05-03 22:35:17 +02:00
parent 6e07b70543
commit 4b38ffa007

View File

@@ -1,4 +1,4 @@
From 6f28e09bf6c8b48e0b1e7acc8b755e076e41fe40 Mon Sep 17 00:00:00 2001 From 18ae2cca1ef8b9e04b463719d03b021245ecfeec Mon Sep 17 00:00:00 2001
From: tastytea <tastytea@tastytea.de> From: tastytea <tastytea@tastytea.de>
Date: Mon, 3 May 2021 21:21:25 +0200 Date: Mon, 3 May 2021 21:21:25 +0200
Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with 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. Also remove -zrelro from LDFLAGS.
--- ---
Makefile | 29 ++++++++++++++--------------- Makefile | 31 +++++++++++++++---------------
src/sc_Squirrel3/sq/Makefile | 8 ++++---- src/sc_Squirrel3/sq/Makefile | 8 ++++----
src/sc_Squirrel3/sqstdlib/Makefile | 16 ++++++++-------- src/sc_Squirrel3/sqstdlib/Makefile | 16 +++++++--------
src/sc_Squirrel3/squirrel/Makefile | 16 ++++++++-------- src/sc_Squirrel3/squirrel/Makefile | 16 +++++++--------
4 files changed, 34 insertions(+), 35 deletions(-) 4 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 3fac7f3..62c50cb 100644 index 3fac7f3..d1104e7 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -8,10 +8,9 @@ ifndef bindir @@ -8,10 +8,9 @@ ifndef bindir
@@ -40,7 +40,7 @@ index 3fac7f3..62c50cb 100644
else else
# Unix like operating systems # Unix like operating systems
CPU_BITS= $(shell getconf LONG_BIT) CPU_BITS= $(shell getconf LONG_BIT)
@@ -28,31 +27,31 @@ else @@ -28,36 +27,36 @@ else
KERNELNAME =$(shell uname -s) KERNELNAME =$(shell uname -s)
ifeq ($(KERNELNAME),Linux) 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 diff --git a/src/sc_Squirrel3/sq/Makefile b/src/sc_Squirrel3/sq/Makefile
index c2cfc7e..08fb2ef 100644 index c2cfc7e..08fb2ef 100644
--- a/src/sc_Squirrel3/sq/Makefile --- a/src/sc_Squirrel3/sq/Makefile