Gentoo Archives: gentoo-commits

From: Ronny Gutbrod <gentoo@××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: games-action/blackvoxel/files/, games-action/blackvoxel/
Date: Mon, 03 May 2021 01:29:59
Message-Id: 1620005336.e3d04544b9a85ca5600f66387312bc49755999d2.tastytea@gentoo
1 commit: e3d04544b9a85ca5600f66387312bc49755999d2
2 Author: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea <DOT> de>
3 AuthorDate: Mon May 3 00:53:01 2021 +0000
4 Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
5 CommitDate: Mon May 3 01:28:56 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e3d04544
7
8 games-action/blackvoxel: Don't strip files.
9
10 Signed-off-by: Ronny (tastytea) Gutbrod <gentoo <AT> tastytea.de>
11
12 games-action/blackvoxel/blackvoxel-2.42.ebuild | 1 +
13 .../files/blackvoxel-2.42-dont-strip-files.patch | 69 ++++++++++++++++++++++
14 2 files changed, 70 insertions(+)
15
16 diff --git a/games-action/blackvoxel/blackvoxel-2.42.ebuild b/games-action/blackvoxel/blackvoxel-2.42.ebuild
17 index 8c2a6db25..4216d47ce 100644
18 --- a/games-action/blackvoxel/blackvoxel-2.42.ebuild
19 +++ b/games-action/blackvoxel/blackvoxel-2.42.ebuild
20 @@ -29,6 +29,7 @@ S="${WORKDIR}/${PN}_source_${PV//./_}"
21 PATCHES=(
22 "${FILESDIR}"/${P}-makefile.patch
23 "${FILESDIR}"/${P}-savedir.patch
24 + "${FILESDIR}"/${P}-dont-strip-files.patch
25 )
26
27 src_compile() {
28
29 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
30 new file mode 100644
31 index 000000000..7be84fbbf
32 --- /dev/null
33 +++ b/games-action/blackvoxel/files/blackvoxel-2.42-dont-strip-files.patch
34 @@ -0,0 +1,69 @@
35 +From b6baebbd17479d9b6f6083797fa4eb63741fa52b Mon Sep 17 00:00:00 2001
36 +From: tastytea <tastytea@××××××××.de>
37 +Date: Mon, 3 May 2021 03:05:19 +0200
38 +Subject: [PATCH] Don't strip files.
39 +
40 +---
41 + Makefile | 10 +++++-----
42 + src/sc_Squirrel3/sq/Makefile | 4 ++--
43 + 2 files changed, 7 insertions(+), 7 deletions(-)
44 +
45 +diff --git a/Makefile b/Makefile
46 +index a85dd7e..51cb0fd 100644
47 +--- a/Makefile
48 ++++ b/Makefile
49 +@@ -19,7 +19,7 @@ OBJ= $(SRC:src/%.cpp=obj/%.o)
50 + ifeq ($(OS),Windows_NT)
51 + CPU_BITS=32
52 + CXXFLAGS+= -O3 -c -fmessage-length=0 -march=i686
53 +- LDFLAGS+= -s -Xlinker --large-address-aware -mwindows -L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 -lopengl32 -llibglut -lsquirrel -lsqstdlib
54 ++ LDFLAGS+= -Xlinker --large-address-aware -mwindows -L"src/sc_Squirrel3/lib" -lmingw32 -lSDLmain -lSDL -llibglew32 -lglu32 -lopengl32 -llibglut -lsquirrel -lsqstdlib
55 + else
56 + # Unix like operating systems
57 + CPU_BITS= $(shell getconf LONG_BIT)
58 +@@ -28,18 +28,18 @@ else
59 +
60 + ifeq ($(KERNELNAME),Linux)
61 + CXXFLAGS+= -O3 -c -fmessage-length=0
62 +- LDFLAGS+=-s -zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
63 ++ LDFLAGS+=-zrelro -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
64 + else ifeq ($(KERNELNAME), FreeBSD)
65 + # To be done...
66 + CXXFLAGS+= -O3 -c -fmessage-length=0
67 +- LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
68 ++ LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
69 + else ifeq ($(KERNELNAME), Darwin)
70 + CXXFLAGS+= -O3 -c -fmessage-length=0
71 +- 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
72 ++ LDFLAGS+=-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
73 + else
74 + # Unknow kernel... trying default flags
75 + CXXFLAGS+= -O3 -c -fmessage-length=0
76 +- LDFLAGS+=-s -L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
77 ++ LDFLAGS+=-L"src/sc_Squirrel3/lib" -lGLU -lSDL -lGLEW -lGL -lsquirrel -lsqstdlib
78 + endif
79 + endif
80 +
81 +diff --git a/src/sc_Squirrel3/sq/Makefile b/src/sc_Squirrel3/sq/Makefile
82 +index 08fb2ef..8cc1cbc 100644
83 +--- a/src/sc_Squirrel3/sq/Makefile
84 ++++ b/src/sc_Squirrel3/sq/Makefile
85 +@@ -12,13 +12,13 @@ SRCS= sq.c
86 +
87 +
88 + sq32:
89 +- $(CXX) -O2 -s -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
90 ++ $(CXX) -O2 -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
91 +
92 + sqprof:
93 + $(CXX) -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
94 +
95 + sq64:
96 +- $(CXX) -O2 -s -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
97 ++ $(CXX) -O2 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
98 +
99 + sq64d:
100 + $(CXX) -O0 -g3 -m64 -fno-exceptions -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
101 +--
102 +2.26.3
103 +