| 1 |
commit: 4b38ffa0071c0a2ac4ed4382e092c0eb8caa2a1f |
| 2 |
Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de> |
| 3 |
AuthorDate: Mon May 3 20:35:17 2021 +0000 |
| 4 |
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de> |
| 5 |
CommitDate: Mon May 3 20:36:25 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4b38ffa0 |
| 7 |
|
| 8 |
games-action/blackvoxel: Re-add jobserver-tweak to patch. |
| 9 |
|
| 10 |
Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de> |
| 11 |
|
| 12 |
.../blackvoxel/files/blackvoxel-2.42-makefile.patch | 20 +++++++++++++------- |
| 13 |
1 file changed, 13 insertions(+), 7 deletions(-) |
| 14 |
|
| 15 |
diff --git a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch |
| 16 |
index de29e1999..ba800e827 100644 |
| 17 |
--- a/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch |
| 18 |
+++ b/games-action/blackvoxel/files/blackvoxel-2.42-makefile.patch |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
-From 6f28e09bf6c8b48e0b1e7acc8b755e076e41fe40 Mon Sep 17 00:00:00 2001 |
| 21 |
+From 18ae2cca1ef8b9e04b463719d03b021245ecfeec Mon Sep 17 00:00:00 2001 |
| 22 |
From: tastytea <tastytea@××××××××.de> |
| 23 |
Date: Mon, 3 May 2021 21:21:25 +0200 |
| 24 |
Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with |
| 25 |
@@ -6,14 +6,14 @@ Subject: [PATCH] Don't overwrite build-flags, replace hardcoded tools with |
| 26 |
|
| 27 |
Also remove -zrelro from LDFLAGS. |
| 28 |
--- |
| 29 |
- Makefile | 29 ++++++++++++++--------------- |
| 30 |
+ Makefile | 31 +++++++++++++++--------------- |
| 31 |
src/sc_Squirrel3/sq/Makefile | 8 ++++---- |
| 32 |
- src/sc_Squirrel3/sqstdlib/Makefile | 16 ++++++++-------- |
| 33 |
- src/sc_Squirrel3/squirrel/Makefile | 16 ++++++++-------- |
| 34 |
- 4 files changed, 34 insertions(+), 35 deletions(-) |
| 35 |
+ src/sc_Squirrel3/sqstdlib/Makefile | 16 +++++++-------- |
| 36 |
+ src/sc_Squirrel3/squirrel/Makefile | 16 +++++++-------- |
| 37 |
+ 4 files changed, 35 insertions(+), 36 deletions(-) |
| 38 |
|
| 39 |
diff --git a/Makefile b/Makefile |
| 40 |
-index 3fac7f3..62c50cb 100644 |
| 41 |
+index 3fac7f3..d1104e7 100644 |
| 42 |
--- a/Makefile |
| 43 |
+++ b/Makefile |
| 44 |
@@ -8,10 +8,9 @@ ifndef bindir |
| 45 |
@@ -40,7 +40,7 @@ index 3fac7f3..62c50cb 100644 |
| 46 |
else |
| 47 |
# Unix like operating systems |
| 48 |
CPU_BITS= $(shell getconf LONG_BIT) |
| 49 |
-@@ -28,31 +27,31 @@ else |
| 50 |
+@@ -28,36 +27,36 @@ else |
| 51 |
KERNELNAME =$(shell uname -s) |
| 52 |
|
| 53 |
ifeq ($(KERNELNAME),Linux) |
| 54 |
@@ -82,6 +82,12 @@ index 3fac7f3..62c50cb 100644 |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
+ squirrel: |
| 59 |
+- cd src/sc_Squirrel3 ; make sq$(CPU_BITS) |
| 60 |
++ +make -C src/sc_Squirrel3 sq$(CPU_BITS) |
| 61 |
+ |
| 62 |
+ clean: |
| 63 |
+ @rm -rf obj |
| 64 |
diff --git a/src/sc_Squirrel3/sq/Makefile b/src/sc_Squirrel3/sq/Makefile |
| 65 |
index c2cfc7e..08fb2ef 100644 |
| 66 |
--- a/src/sc_Squirrel3/sq/Makefile |
Archives