Gentoo Archives: gentoo-commits

From: Theo Anderson <telans@××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-lang/fbc/files/1.06.0/fbc/, dev-lang/fbc/files/1.06.0/bootstrap/, ...
Date: Sat, 26 Dec 2020 09:10:02
Message-Id: 1608973771.52727e4710d6a61f2755aeb9c7624631b3382825.telans@gentoo
1 commit: 52727e4710d6a61f2755aeb9c7624631b3382825
2 Author: Theo Anderson <telans <AT> posteo <DOT> de>
3 AuthorDate: Sat Dec 26 06:43:43 2020 +0000
4 Commit: Theo Anderson <telans <AT> posteo <DOT> de>
5 CommitDate: Sat Dec 26 09:09:31 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=52727e47
7
8 dev-lang/fbc: drop old
9
10 Package-Manager: Portage-3.0.12, Repoman-3.0.2
11 Signed-off-by: Theo Anderson <telans <AT> posteo.de>
12
13 dev-lang/fbc/Manifest | 6 -
14 dev-lang/fbc/fbc-1.06.0.ebuild | 93 ------------
15 dev-lang/fbc/fbc-1.07.0.ebuild | 89 -----------
16 ...efile-Fix-bootstrap-recipe-race-condition.patch | 37 -----
17 ...kefile-Implement-bootstrap-minimal-target.patch | 56 -------
18 ...n-all-options-from-all-Wa-Wc-and-Wl-flags.patch | 35 -----
19 ...lement-the-strip-nostrip-compiler-options.patch | 169 ---------------------
20 7 files changed, 485 deletions(-)
21
22 diff --git a/dev-lang/fbc/Manifest b/dev-lang/fbc/Manifest
23 index fd2d44fc..7c9cade4 100644
24 --- a/dev-lang/fbc/Manifest
25 +++ b/dev-lang/fbc/Manifest
26 @@ -1,10 +1,4 @@
27 -DIST FreeBASIC-1.06.0-source-bootstrap.tar.xz 7742292 BLAKE2B fd32c6e5edf6e8c27538465141c6b870d6c893f8e05fc8d91b273f9268a68065709cba95e8c5cd8b86786522b2ac1eaf1a6a547227432bbc9998eb1288b29515 SHA512 42878091994cae7e0a2f4ba1d2d83a80d32d62ad06790ac06643a266200b53b7ce2480a651b1622910a2733756b7ca032a5be1bb73ee3f796146394eebb9f43c
28 -DIST FreeBASIC-1.07.0-source-bootstrap.tar.xz 8237216 BLAKE2B f657f8a81d412435b8b4167ded5019e9821f0cf47db9d38708da0eea6bdc8835a77c643122e792616aefbbb557f228e6ab06e823c10e1afe922c9e4b34088989 SHA512 3a69e2fe5a81b8990e0ec811a9aeb0c9bdd84e858983800c444717197754a0b8e2945091d80d4c6736b691798dbc571b3e7f885d6a6e4564c9ca1021a2fae71c
29 DIST FreeBASIC-1.07.1-source-bootstrap.tar.xz 9098748 BLAKE2B 3c3970ab014f79193dad23b6f22c5ffc61d6f588219dcf00f430ce2c9045dc2af8aa42bdad4f1d63d76591aae14b42553cf6ece88052f0dc78e09c6fb5c4d875 SHA512 89250fb4d79e420151bae8208945e26c5d4e63ba8bbb60658b2c5601ceeea238b387d7d7a2b52d60da2243e5d3d31f602c3657394be72a37c256e777be23b0a8
30 DIST FreeBASIC-1.07.2-source-bootstrap.tar.xz 10700992 BLAKE2B e7016e5f58ae79086c0445bf6a09f33d4335af771422778be407e3351d583522e16f137763e471ba88e47b4318ab5bd2aec882ef5e5ff85cc334b0eccf27fdc5 SHA512 f381d14343496f68d3401ad1a66ff4fb1314270eddebb72ed2bc5624b856c4b29e7e14062f531a5158d892bb73d9aa80ff54fe7c260b4b8967b1330d26b2ecfc
31 -DIST fbc-1.06.0-bootstrap-dist-linux-x86.patch 147301 BLAKE2B 8320f988bc84f5df1b732719a11d1a8edbfceff04ad51b1fbd883eb21d20f1c2f16b8c6ae41b5b0472e4faf1058345969b85ed0c93c071de3c9ed703e298106a SHA512 b2ee285504ce0f8a6a01ee5da7661e40c4a6bb0075f26751fbc79a328cac66f7809ad4c2489eaab01a6e6432ca6d76e19835c86bddf9df5af3b89c547fd8ffb3
32 -DIST fbc-1.06.0-bootstrap-dist-linux-x86_64.patch 198197 BLAKE2B 72083bef84aed5ec2d95badb70a42db2e5d89084454f79aef41808a018ab238b1d230cb7282f4adf1be9d003c3865cb914fbf057fbd84c069dfecc4abd3da80b SHA512 771077a2526164223c3ae157558355538701224863b2a5923881ac2d2568f4cd1f5489df73aa8d55b1efccc82fe9e251e893a2b361363c1862d4c1e7bc3fb4ba
33 -DIST fbc-1.06.0.tar.gz 8847831 BLAKE2B 9245137995f9f3e2ff5adaf9b273593434ac9ec96919b2c970ec26183fe6fb7afee35753f2dd92f4b34d1aade92871e5a6722571a5ba04dde323fd7fb06c55c5 SHA512 687dcf665bb10e6a771cc01d02c21da77d89e052308600038dce526ba1ccfc6554d409dab184f3495557c9e4fdf744fd7a9088b4b137b782a9ab8633622c5484
34 -DIST fbc-1.07.0.tar.gz 8938137 BLAKE2B 14849dd0cfb0f0a2d0f2e4966a855964027adbacc2253e236f9f10ba73c40b16714d8fb75778cac8cb6eb1600d6adeb2037929a376b4938961e53e5de83fafba SHA512 1cab52e97854b3ef17db6ba4750c0216f3bd04e23997f005189988007014574467c0f63f41ad822d089a18e97439ba52743223d1bb282133b41c0625b66cd8f5
35 DIST fbc-1.07.1.tar.gz 8938056 BLAKE2B 965425426605b9e0018e066852a67c355d168276b434e6779e151fad38820a956b5b763aad427c6728be4a74b0956b099a0bb8abd0d76fececc6cf8f0204d3c1 SHA512 7d49b9546e242b1c366b2378f71cf1640b85c85e09f4c2bd99ef268e6b4e5e45a710b7a00f7d807245aec518f299d173635572b77483826c1f273e047dbe3679
36 DIST fbc-1.07.2.tar.gz 9032306 BLAKE2B c44eb74bb0b11f8315cda29e13157ce5f7a92070f0e6df833ad9dda4ebe37db6450afe2b82eb763ebee5ed0c33b4ce458fd3b53430f32da8ad5a71cd84411c67 SHA512 0577203fb8a325f611c88456446721e8bb14656beb235f3965bcd53e14cc7c7fa012a68535ff4c12351fad31d9a22a759f12bc9fe0be5d1dad124d3fe377daaf
37
38 diff --git a/dev-lang/fbc/fbc-1.06.0.ebuild b/dev-lang/fbc/fbc-1.06.0.ebuild
39 deleted file mode 100644
40 index 709f2a86..00000000
41 --- a/dev-lang/fbc/fbc-1.06.0.ebuild
42 +++ /dev/null
43 @@ -1,93 +0,0 @@
44 -# Copyright 1999-2020 Gentoo Authors
45 -# Distributed under the terms of the GNU General Public License v2
46 -
47 -EAPI=7
48 -
49 -DESCRIPTION="A free/open source, multi-platform BASIC compiler."
50 -HOMEPAGE="https://www.freebasic.net"
51 -SRC_URI="https://github.com/freebasic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
52 - https://github.com/freebasic/${PN}/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz
53 - https://gist.github.com/vilhelmgray/08cebe0f22e303f7d5e6e5bc71e3d1f2/raw/70c1f43eec81c35bdc780ace7fdf6a3c8b548c85/fbc-1.06.0-bootstrap-dist-linux-x86.patch
54 - https://gist.github.com/vilhelmgray/08cebe0f22e303f7d5e6e5bc71e3d1f2/raw/70c1f43eec81c35bdc780ace7fdf6a3c8b548c85/fbc-1.06.0-bootstrap-dist-linux-x86_64.patch"
55 -
56 -LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+"
57 -SLOT="0"
58 -KEYWORDS="~amd64 ~x86"
59 -IUSE="gpm libffi opengl X"
60 -
61 -DEPEND="
62 - sys-libs/ncurses:=
63 - gpm? ( sys-libs/gpm )
64 - libffi? ( dev-libs/libffi )
65 - opengl? ( virtual/opengl )
66 - X? (
67 - x11-libs/libX11
68 - x11-libs/libXext
69 - x11-libs/libXpm
70 - x11-libs/libXrandr
71 - x11-libs/libXrender
72 - )"
73 -RDEPEND="${DEPEND}"
74 -
75 -PATCHES="${FILESDIR}/${PV}/${PN}"
76 -
77 -DOCS="${S}/doc/fbc.1"
78 -
79 -BOOTSTRAP_S="${WORKDIR}/FreeBASIC-${PV}-source-bootstrap"
80 -
81 -src_unpack() {
82 - # We only need bootstrap source code if fbc is not already present
83 - if ! has_version dev-lang/fbc; then
84 - unpack FreeBASIC-${PV}-source-bootstrap.tar.xz
85 - fi
86 - unpack ${P}.tar.gz
87 -}
88 -
89 -src_prepare() {
90 - # We only need bootstrap source code if fbc is not already present
91 - if ! has_version dev-lang/fbc; then
92 - cd "${BOOTSTRAP_S}" || die "cd failed"
93 - eapply "${FILESDIR}/${PV}/bootstrap"
94 - eapply "${DISTDIR}/fbc-1.06.0-bootstrap-dist-linux-x86.patch"
95 - eapply "${DISTDIR}/fbc-1.06.0-bootstrap-dist-linux-x86_64.patch"
96 - cd "${S}" || die "cd failed"
97 - fi
98 - default
99 -}
100 -
101 -src_compile() {
102 - local fbc="fbc"
103 - local fbcflags=""
104 -
105 - # We only need bootstrap compiler if fbc is not already present
106 - if ! has_version dev-lang/fbc; then
107 - cd "${BOOTSTRAP_S}" || die "cd failed"
108 -
109 - # Build bootstrap compiler
110 - emake bootstrap-minimal
111 -
112 - # Set bootstrap compiler to build fbc
113 - fbc="${BOOTSTRAP_S}/bin/fbc"
114 - fbcflags="-i ${BOOTSTRAP_S}/inc"
115 -
116 - cd "${S}" || die "cd failed"
117 - fi
118 -
119 - local xcflags=(
120 - $(usex gpm "" "-DDISABLE_GPM")
121 - $(usex libffi "" " -DDISABLE_FFI")
122 - $(usex opengl "" " -DDISABLE_OPENGL")
123 - $(usex X "" " -DDISABLE_X11")
124 - )
125 -
126 - # fbc requires a space after the -Wl option
127 - local fblflags=${LDFLAGS//-Wl,/-Wl }
128 -
129 - # Build fbc
130 - emake CFLAGS="${CFLAGS} ${xcflags[*]}" FBC="${fbc}" FBCFLAGS="${fbcflags}" FBLFLAGS="${fblflags}" TARGET=${CHOST}
131 -}
132 -
133 -src_install() {
134 - emake DESTDIR="${D}" prefix="/usr" TARGET=${CHOST} install
135 - einstalldocs
136 -}
137
138 diff --git a/dev-lang/fbc/fbc-1.07.0.ebuild b/dev-lang/fbc/fbc-1.07.0.ebuild
139 deleted file mode 100644
140 index 6df41992..00000000
141 --- a/dev-lang/fbc/fbc-1.07.0.ebuild
142 +++ /dev/null
143 @@ -1,89 +0,0 @@
144 -# Copyright 1999-2020 Gentoo Authors
145 -# Distributed under the terms of the GNU General Public License v2
146 -
147 -EAPI=7
148 -
149 -DESCRIPTION="A free/open source, multi-platform BASIC compiler."
150 -HOMEPAGE="https://www.freebasic.net"
151 -SRC_URI="https://github.com/freebasic/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
152 - https://github.com/freebasic/${PN}/releases/download/${PV}/FreeBASIC-${PV}-source-bootstrap.tar.xz"
153 -
154 -LICENSE="FDL-1.2 GPL-2+ LGPL-2.1+"
155 -SLOT="0"
156 -KEYWORDS="~amd64 ~x86"
157 -IUSE="gpm libffi opengl X"
158 -
159 -DEPEND="
160 - sys-libs/ncurses:=
161 - gpm? ( sys-libs/gpm )
162 - libffi? ( dev-libs/libffi )
163 - opengl? ( virtual/opengl )
164 - X? (
165 - x11-libs/libX11
166 - x11-libs/libXext
167 - x11-libs/libXpm
168 - x11-libs/libXrandr
169 - x11-libs/libXrender
170 - )"
171 -RDEPEND="${DEPEND}"
172 -
173 -PATCHES=( "${FILESDIR}"/${P}-Pass-ltinfo-to-linker.patch )
174 -
175 -DOCS="${S}/doc/fbc.1"
176 -
177 -BOOTSTRAP_S="${WORKDIR}/FreeBASIC-${PV}-source-bootstrap"
178 -
179 -src_unpack() {
180 - # We only need bootstrap source code if fbc is not already present
181 - if ! has_version dev-lang/fbc; then
182 - unpack FreeBASIC-${PV}-source-bootstrap.tar.xz
183 - fi
184 - unpack ${P}.tar.gz
185 -}
186 -
187 -src_prepare() {
188 - # We only need bootstrap source code if fbc is not already present
189 - if ! has_version dev-lang/fbc; then
190 - cd "${BOOTSTRAP_S}" || die "cd failed"
191 - eapply "${PATCHES[@]}"
192 - cd "${S}" || die "cd failed"
193 - fi
194 - eapply_user
195 -}
196 -
197 -src_compile() {
198 - local fbc="fbc"
199 - local fbcflags=""
200 -
201 - # We only need bootstrap compiler if fbc is not already present
202 - if ! has_version dev-lang/fbc; then
203 - cd "${BOOTSTRAP_S}" || die "cd failed"
204 -
205 - # Build bootstrap compiler
206 - emake bootstrap-minimal
207 -
208 - # Set bootstrap compiler to build fbc
209 - fbc="${BOOTSTRAP_S}/bin/fbc"
210 - fbcflags="-i ${BOOTSTRAP_S}/inc"
211 -
212 - cd "${S}" || die "cd failed"
213 - fi
214 -
215 - local xcflags=(
216 - $(usex gpm "" "-DDISABLE_GPM")
217 - $(usex libffi "" " -DDISABLE_FFI")
218 - $(usex opengl "" " -DDISABLE_OPENGL")
219 - $(usex X "" " -DDISABLE_X11")
220 - )
221 -
222 - # fbc requires a space after the -Wl option
223 - local fblflags=${LDFLAGS//-Wl,/-Wl }
224 -
225 - # Build fbc
226 - emake CFLAGS="${CFLAGS} ${xcflags[*]}" FBC="${fbc}" FBCFLAGS="${fbcflags}" FBLFLAGS="${fblflags}" TARGET=${CHOST}
227 -}
228 -
229 -src_install() {
230 - emake DESTDIR="${D}" prefix="/usr" TARGET=${CHOST} install
231 - einstalldocs
232 -}
233
234 diff --git a/dev-lang/fbc/files/1.06.0/bootstrap/0001-makefile-Fix-bootstrap-recipe-race-condition.patch b/dev-lang/fbc/files/1.06.0/bootstrap/0001-makefile-Fix-bootstrap-recipe-race-condition.patch
235 deleted file mode 100644
236 index 10939dd9..00000000
237 --- a/dev-lang/fbc/files/1.06.0/bootstrap/0001-makefile-Fix-bootstrap-recipe-race-condition.patch
238 +++ /dev/null
239 @@ -1,37 +0,0 @@
240 -From 94764a6bf44ab9146e23fb0559ef99f35ceeec79 Mon Sep 17 00:00:00 2001
241 -From: William Breathitt Gray <vilhelm.gray@×××××.com>
242 -Date: Sat, 6 Apr 2019 11:20:10 +0900
243 -Subject: [PATCH] makefile: Fix bootstrap recipe race condition
244 -
245 -Since fbrt0.o and libfb.a are statically linked to the bootstrap fbc,
246 -rtlib should be listed as a dependency of BOOTSTRAP_FBC. This patch
247 -fixes the race condition described in issue #131.
248 ----
249 - makefile | 4 ++--
250 - 1 file changed, 2 insertions(+), 2 deletions(-)
251 -
252 -diff --git a/makefile b/makefile
253 -index aeca4c07e..0422dfff7 100644
254 ---- a/makefile
255 -+++ b/makefile
256 -@@ -1063,7 +1063,7 @@ bootstrap-dist:
257 - #
258 - BOOTSTRAP_FBC := bootstrap/fbc$(EXEEXT)
259 - .PHONY: bootstrap
260 --bootstrap: rtlib gfxlib2 $(BOOTSTRAP_FBC)
261 -+bootstrap: gfxlib2 $(BOOTSTRAP_FBC)
262 - mkdir -p bin
263 - cp $(BOOTSTRAP_FBC) $(FBC_EXE)
264 -
265 -@@ -1089,7 +1089,7 @@ endif
266 - ifneq ($(filter darwin freebsd linux netbsd openbsd solaris,$(TARGET_OS)),)
267 - BOOTSTRAP_LIBS := -lncurses -lm -pthread
268 - endif
269 --$(BOOTSTRAP_FBC): $(BOOTSTRAP_OBJ)
270 -+$(BOOTSTRAP_FBC): rtlib $(BOOTSTRAP_OBJ)
271 - $(QUIET_LINK)$(CC) -o $@ $(libdir)/fbrt0.o bootstrap/$(FBTARGET)/*.o $(libdir)/libfb.a $(BOOTSTRAP_LIBS)
272 -
273 - .PHONY: clean-bootstrap
274 ---
275 -2.21.0
276 -
277
278 diff --git a/dev-lang/fbc/files/1.06.0/bootstrap/0002-makefile-Implement-bootstrap-minimal-target.patch b/dev-lang/fbc/files/1.06.0/bootstrap/0002-makefile-Implement-bootstrap-minimal-target.patch
279 deleted file mode 100644
280 index 17dfb751..00000000
281 --- a/dev-lang/fbc/files/1.06.0/bootstrap/0002-makefile-Implement-bootstrap-minimal-target.patch
282 +++ /dev/null
283 @@ -1,56 +0,0 @@
284 -From dc6e5a3b68810d0e97625b57055bd98678e13a53 Mon Sep 17 00:00:00 2001
285 -From: William Breathitt Gray <vilhelm.gray@×××××.com>
286 -Date: Tue, 9 Apr 2019 18:51:38 +0900
287 -Subject: [PATCH] makefile: Implement bootstrap-minimal target
288 -
289 -The bootstrap-minimal target builds a bootstrap fbc with only the
290 -minimal features necessary to build another fbc.
291 ----
292 - makefile | 16 ++++++++++++----
293 - 1 file changed, 12 insertions(+), 4 deletions(-)
294 -
295 -diff --git a/makefile b/makefile
296 -index 0422dfff7..245e95669 100644
297 ---- a/makefile
298 -+++ b/makefile
299 -@@ -64,8 +64,9 @@
300 - # warning-tests
301 - # clean-tests
302 - #
303 --# bootstrap-dist Create source package with precompiled fbc sources
304 --# bootstrap Build fbc from the precompiled sources (only if precompiled sources exist)
305 -+# bootstrap-dist Create source package with precompiled fbc sources
306 -+# bootstrap Build fbc from the precompiled sources (only if precompiled sources exist)
307 -+# bootstrap-minimal Build fbc from the precompiled sources (only if precompiled sources exist) with only the minimal features needed to compile another fbc
308 - #
309 - # makefile configuration:
310 - # FB[C|L]FLAGS to set -g -exx etc. for the compiler build and/or link
311 -@@ -368,6 +369,11 @@ ALLFBCFLAGS += -e -m fbc -w pedantic
312 - ALLFBLFLAGS += -e -m fbc -w pedantic
313 - ALLCFLAGS += -Wall -Wextra -Wno-unused-parameter -Werror-implicit-function-declaration
314 -
315 -+ifneq ($(filter bootstrap-minimal, $(MAKECMDGOALS)),)
316 -+ # Disable features not needed to compile a minimal bootstrap fbc
317 -+ ALLCFLAGS += -DDISABLE_GPM -DDISABLE_FFI -DDISABLE_X11
318 -+endif
319 -+
320 - ifeq ($(TARGET_OS),xbox)
321 - ifeq ($(OPENXDK),)
322 - $(error Please set OPENXDK=<OpenXDK directory>)
323 -@@ -1061,9 +1067,11 @@ bootstrap-dist:
324 - # Build the fbc[.exe] binary from the precompiled sources in the bootstrap/
325 - # directory.
326 - #
327 -+.PHONY: bootstrap bootstrap-minimal
328 -+bootstrap: gfxlib2 bootstrap-minimal
329 -+
330 - BOOTSTRAP_FBC := bootstrap/fbc$(EXEEXT)
331 --.PHONY: bootstrap
332 --bootstrap: gfxlib2 $(BOOTSTRAP_FBC)
333 -+bootstrap-minimal: $(BOOTSTRAP_FBC)
334 - mkdir -p bin
335 - cp $(BOOTSTRAP_FBC) $(FBC_EXE)
336 -
337 ---
338 -2.21.0
339 -
340
341 diff --git a/dev-lang/fbc/files/1.06.0/fbc/0001-Pass-down-all-options-from-all-Wa-Wc-and-Wl-flags.patch b/dev-lang/fbc/files/1.06.0/fbc/0001-Pass-down-all-options-from-all-Wa-Wc-and-Wl-flags.patch
342 deleted file mode 100644
343 index 922120ba..00000000
344 --- a/dev-lang/fbc/files/1.06.0/fbc/0001-Pass-down-all-options-from-all-Wa-Wc-and-Wl-flags.patch
345 +++ /dev/null
346 @@ -1,35 +0,0 @@
347 -From d1e485d6f1beb39e3228f86c2448b2fac77d1e62 Mon Sep 17 00:00:00 2001
348 -From: William Breathitt Gray <vilhelm.gray@×××××.com>
349 -Date: Sun, 21 Apr 2019 19:10:48 +0900
350 -Subject: [PATCH] Pass down all options from all -Wa, -Wc, and -Wl flags
351 -
352 -All options from all -Wa, -Wc, and -Wl flags are passed down to their
353 -respective programs. This fixes issue #137.
354 ----
355 - src/compiler/fbc.bas | 6 +++---
356 - 1 file changed, 3 insertions(+), 3 deletions(-)
357 -
358 -diff --git a/src/compiler/fbc.bas b/src/compiler/fbc.bas
359 -index 0f04217a1..f6fa3d9db 100644
360 ---- a/src/compiler/fbc.bas
361 -+++ b/src/compiler/fbc.bas
362 -@@ -1869,13 +1869,13 @@ private sub handleOpt(byval optid as integer, byref arg as string)
363 - end if
364 -
365 - case OPT_WA
366 -- fbc.extopt.gas = " " + hReplace( arg, ",", " " ) + " "
367 -+ fbc.extopt.gas += " " + hReplace( arg, ",", " " ) + " "
368 -
369 - case OPT_WC
370 -- fbc.extopt.gcc = " " + hReplace( arg, ",", " " ) + " "
371 -+ fbc.extopt.gcc += " " + hReplace( arg, ",", " " ) + " "
372 -
373 - case OPT_WL
374 -- fbc.extopt.ld = " " + hReplace( arg, ",", " " ) + " "
375 -+ fbc.extopt.ld += " " + hReplace( arg, ",", " " ) + " "
376 -
377 - case OPT_X
378 - fbc.outname = arg
379 ---
380 -2.21.0
381 -
382
383 diff --git a/dev-lang/fbc/files/1.06.0/fbc/0002-Implement-the-strip-nostrip-compiler-options.patch b/dev-lang/fbc/files/1.06.0/fbc/0002-Implement-the-strip-nostrip-compiler-options.patch
384 deleted file mode 100644
385 index 3298044b..00000000
386 --- a/dev-lang/fbc/files/1.06.0/fbc/0002-Implement-the-strip-nostrip-compiler-options.patch
387 +++ /dev/null
388 @@ -1,169 +0,0 @@
389 -From b8bfa87f56a86c3c81976b1a8c0411ac4240ae9e Mon Sep 17 00:00:00 2001
390 -From: William Breathitt Gray <vilhelm.gray@×××××.com>
391 -Date: Wed, 24 Apr 2019 16:59:08 +0900
392 -Subject: [PATCH] Implement the '-strip'/'-nostrip' compiler options
393 -
394 -This change allows users to choose whether or not to strip symbol
395 -information from the output file. The fbc '-strip' option is analogous
396 -to the ld '--strip-all' option. The ENABLE_STRIPALL compiler build
397 -option is introduced to configure whether fbc defaults to stripping
398 -symbols.
399 -
400 -This fixes issue #140.
401 ----
402 - makefile | 8 ++++++++
403 - src/compiler/fbc.bas | 21 ++++++++++++++++++++-
404 - 2 files changed, 28 insertions(+), 1 deletion(-)
405 -
406 -diff --git a/makefile b/makefile
407 -index 245e95669..519fe7e7b 100644
408 ---- a/makefile
409 -+++ b/makefile
410 -@@ -81,6 +81,7 @@
411 - # ENABLE_SUFFIX=-0.24 append a string like "-0.24" to fbc/FB dir names,
412 - # and use "-d ENABLE_SUFFIX=$(ENABLE_SUFFIX)" (non-standalone only)
413 - # ENABLE_LIB64=1 use prefix/lib64/ instead of prefix/lib/ for 64bit libs (non-standalone only)
414 -+# ENABLE_STRIPALL=1 use "-d ENABLE_STRIPALL" with select targets
415 - # FBPACKAGE bindist: The package/archive file name without path or extension
416 - # FBPACKSUFFIX bindist: Allows adding a custom suffix to the normal package name (and the toplevel dir in the archive)
417 - # FBMANIFEST bindist: The manifest file name without path or extension
418 -@@ -92,6 +93,7 @@
419 - # -d ENABLE_SUFFIX=-0.24 assume FB's lib dir uses the given suffix (non-standalone only)
420 - # -d ENABLE_PREFIX=/some/path hard-code specific $(prefix) into fbc
421 - # -d ENABLE_LIB64 use prefix/lib64/ instead of prefix/lib/ for 64bit libs (non-standalone only)
422 -+# -d ENABLE_STRIPALL configure fbc to pass down '--strip-all' to linker by default
423 - #
424 - # rtlib/gfxlib2 source code configuration (CFLAGS):
425 - # -DDISABLE_X11 build without X11 headers (disables X11 gfx driver)
426 -@@ -429,6 +431,12 @@ endif
427 - ifdef ENABLE_LIB64
428 - ALLFBCFLAGS += -d ENABLE_LIB64
429 - endif
430 -+ifdef ENABLE_STRIPALL
431 -+ ifneq ($(filter dos win32,$(TARGET_OS)),)
432 -+ ALLFBCFLAGS += -d ENABLE_STRIPALL
433 -+ endif
434 -+endif
435 -+
436 -
437 - ALLFBCFLAGS += $(FBCFLAGS) $(FBFLAGS)
438 - ALLFBLFLAGS += $(FBLFLAGS) $(FBFLAGS)
439 -diff --git a/src/compiler/fbc.bas b/src/compiler/fbc.bas
440 -index f6fa3d9db..f9b665bbc 100644
441 ---- a/src/compiler/fbc.bas
442 -+++ b/src/compiler/fbc.bas
443 -@@ -100,6 +100,7 @@ type FBCCTX
444 - xbe_title as zstring * FB_MAXNAMELEN+1 '' For the '-title <title>' xbox option
445 - nodeflibs as integer
446 - staticlink as integer
447 -+ stripsymbols as integer
448 -
449 - '' Compiler paths
450 - prefix as zstring * FB_MAXPATHLEN+1 '' Path from -prefix or empty
451 -@@ -163,6 +164,10 @@ private sub fbcInit( )
452 -
453 - fbGlobalInit()
454 -
455 -+#ifdef ENABLE_STRIPALL
456 -+ fbc.stripsymbols = TRUE
457 -+#endif
458 -+
459 - fbc.objinf.lang = fbGetOption( FB_COMPOPT_LANG )
460 -
461 - fbc.print = -1
462 -@@ -762,7 +767,7 @@ private function hLinkFiles( ) as integer
463 -
464 - if( fbGetOption( FB_COMPOPT_DEBUGINFO ) = FALSE ) then
465 - if( fbGetOption( FB_COMPOPT_PROFILE ) = FALSE ) then
466 -- if( fbGetOption( FB_COMPOPT_TARGET ) <> FB_COMPTARGET_DARWIN ) then
467 -+ if( fbc.stripsymbols ) then
468 - ldcline += " -s"
469 - end if
470 - end if
471 -@@ -1417,6 +1422,7 @@ enum
472 - OPT_NODEFLIBS
473 - OPT_NOERRLINE
474 - OPT_NOOBJINFO
475 -+ OPT_NOSTRIP
476 - OPT_O
477 - OPT_OPTIMIZE
478 - OPT_P
479 -@@ -1432,6 +1438,7 @@ enum
480 - OPT_S
481 - OPT_SHOWINCLUDES
482 - OPT_STATIC
483 -+ OPT_STRIP
484 - OPT_T
485 - OPT_TARGET
486 - OPT_TITLE
487 -@@ -1480,6 +1487,7 @@ dim shared as integer option_takes_argument(0 to (OPT__COUNT - 1)) = _
488 - FALSE, _ '' OPT_NODEFLIBS
489 - FALSE, _ '' OPT_NOERRLINE
490 - FALSE, _ '' OPT_NOOBJINFO
491 -+ FALSE, _ '' OPT_NOSTRIP
492 - TRUE , _ '' OPT_O
493 - TRUE , _ '' OPT_OPTIMIZE
494 - TRUE , _ '' OPT_P
495 -@@ -1495,6 +1503,7 @@ dim shared as integer option_takes_argument(0 to (OPT__COUNT - 1)) = _
496 - TRUE , _ '' OPT_S
497 - FALSE, _ '' OPT_SHOWINCLUDES
498 - FALSE, _ '' OPT_STATIC
499 -+ FALSE, _ '' OPT_STRIP
500 - TRUE , _ '' OPT_T
501 - TRUE , _ '' OPT_TARGET
502 - TRUE , _ '' OPT_TITLE
503 -@@ -1676,6 +1685,9 @@ private sub handleOpt(byval optid as integer, byref arg as string)
504 - case OPT_NOOBJINFO
505 - fbSetOption( FB_COMPOPT_OBJINFO, FALSE )
506 -
507 -+ case OPT_NOSTRIP
508 -+ fbc.stripsymbols = FALSE
509 -+
510 - case OPT_O
511 - '' Error if there already is an -o waiting to be assigned
512 - hCheckWaitingObjfile( )
513 -@@ -1765,6 +1777,9 @@ private sub handleOpt(byval optid as integer, byref arg as string)
514 - case OPT_STATIC
515 - fbc.staticlink = TRUE
516 -
517 -+ case OPT_STRIP
518 -+ fbc.stripsymbols = TRUE
519 -+
520 - case OPT_T
521 - fbSetOption( FB_COMPOPT_STACKSIZE, clng( arg ) * 1024 )
522 -
523 -@@ -1963,6 +1978,7 @@ private function parseOption(byval opt as zstring ptr) as integer
524 - CHECK("noerrline", OPT_NOERRLINE)
525 - CHECK("nodeflibs", OPT_NODEFLIBS)
526 - CHECK("noobjinfo", OPT_NOOBJINFO)
527 -+ CHECK("nostrip", OPT_NOSTRIP)
528 -
529 - case asc("o")
530 - ONECHAR(OPT_O)
531 -@@ -1990,6 +2006,7 @@ private function parseOption(byval opt as zstring ptr) as integer
532 - ONECHAR(OPT_S)
533 - CHECK("showincludes", OPT_SHOWINCLUDES)
534 - CHECK("static", OPT_STATIC)
535 -+ CHECK("strip", OPT_STRIP)
536 -
537 - case asc("t")
538 - ONECHAR(OPT_T)
539 -@@ -3384,6 +3401,7 @@ private sub hPrintOptions( )
540 - print " -nodeflibs Do not include the default libraries"
541 - print " -noerrline Do not show source context in error messages"
542 - print " -noobjinfo Do not read/write compile-time info from/to .o and .a files"
543 -+ print " -nostrip Do not strip symbol information from the output file"
544 - print " -o <file> Set .o (or -pp .bas) file name for prev/next input file"
545 - print " -O <value> Optimization level (default: 0)"
546 - print " -p <path> Add a library search path"
547 -@@ -3401,6 +3419,7 @@ private sub hPrintOptions( )
548 - print " -s console|gui Select win32 subsystem"
549 - print " -showincludes Display a tree of file names of #included files"
550 - print " -static Prefer static libraries over dynamic ones when linking"
551 -+ print " -strip Omit all symbol information from the output file"
552 - print " -t <value> Set .exe stack size in kbytes, default: 1024 (win32/dos)"
553 - print " -target <name> Set cross-compilation target"
554 - print " -title <name> Set XBE display title (xbox)"
555 ---
556 -2.21.0
557 -