1 |
commit: dde4ba3557de23f96808c400a657f9898f2001d9 |
2 |
Author: Stelian Ionescu <sionescu <AT> cddr <DOT> org> |
3 |
AuthorDate: Tue Mar 29 22:50:30 2011 +0000 |
4 |
Commit: Stelian Ionescu <sionescu <AT> cddr <DOT> org> |
5 |
CommitDate: Tue Mar 29 22:50:30 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=dde4ba35 |
7 |
|
8 |
dev-lisp/sbcl: bump to version 1.0.47 |
9 |
|
10 |
--- |
11 |
.../files/1.0.47-gentoo-fix_build_system.patch | 546 ++++++++++++++++++++ |
12 |
.../{sbcl-1.0.45.ebuild => sbcl-1.0.47.ebuild} | 1 - |
13 |
2 files changed, 546 insertions(+), 1 deletions(-) |
14 |
|
15 |
diff --git a/dev-lisp/sbcl/files/1.0.47-gentoo-fix_build_system.patch b/dev-lisp/sbcl/files/1.0.47-gentoo-fix_build_system.patch |
16 |
new file mode 100644 |
17 |
index 0000000..3921255 |
18 |
--- /dev/null |
19 |
+++ b/dev-lisp/sbcl/files/1.0.47-gentoo-fix_build_system.patch |
20 |
@@ -0,0 +1,546 @@ |
21 |
+diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk |
22 |
+index d3ffbad..7a5936e 100644 |
23 |
+--- a/contrib/asdf-module.mk |
24 |
++++ b/contrib/asdf-module.mk |
25 |
+@@ -1,3 +1,5 @@ |
26 |
++# -*- makefile -*- included by contribs built with ASDF |
27 |
++ |
28 |
+ CC=gcc |
29 |
+ |
30 |
+ # We need to extend flags to the C compiler and the linker |
31 |
+@@ -7,6 +9,9 @@ CC=gcc |
32 |
+ # directly via ASDF from a non-C-aware module which has these tricky |
33 |
+ # ones as dependencies. |
34 |
+ |
35 |
++# from src/runtime/ |
36 |
++-include platform.mk |
37 |
++ |
38 |
+ UNAME:=$(shell uname -s) |
39 |
+ |
40 |
+ ifeq (SunOS,$(UNAME)) |
41 |
+@@ -23,7 +28,9 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME))) |
42 |
+ CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC)))) |
43 |
+ endif |
44 |
+ |
45 |
+-export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS |
46 |
++EXTRA_CFLAGS += $(CFLAGS) |
47 |
++ |
48 |
++export CC SBCL EXTRA_CFLAGS |
49 |
+ |
50 |
+ all: $(EXTRA_ALL_TARGETS) |
51 |
+ $(MAKE) -C ../asdf |
52 |
+diff --git a/contrib/vanilla-module.mk b/contrib/vanilla-module.mk |
53 |
+index 41c1771..4c343ee 100644 |
54 |
+--- a/contrib/vanilla-module.mk |
55 |
++++ b/contrib/vanilla-module.mk |
56 |
+@@ -1,3 +1,7 @@ |
57 |
++# -*- makefile -*- included by contribs that don't use ASDF |
58 |
++ |
59 |
++# from src/runtime/ |
60 |
++-include platform.mk |
61 |
+ |
62 |
+ $(MODULE).fasl: $(MODULE).lisp ../../output/sbcl.core |
63 |
+ $(SBCL) --eval '(compile-file (format nil "SYS:CONTRIB;~:@(~A~);~:@(~A~).LISP" "$(MODULE)" "$(MODULE)"))' </dev/null |
64 |
+diff --git a/make-target-contrib.sh b/make-target-contrib.sh |
65 |
+index 85345e6..e3185d8 100644 |
66 |
+--- a/make-target-contrib.sh |
67 |
++++ b/make-target-contrib.sh |
68 |
+@@ -66,7 +66,7 @@ for i in contrib/*; do |
69 |
+ # export INSTALL_DIR=$SBCL_HOME/`basename $i ` |
70 |
+ test -f $i/test-passed && rm $i/test-passed |
71 |
+ # hack to get exit codes right. |
72 |
+- if $GNUMAKE -C $i test 2>&1 && touch $i/test-passed ; then |
73 |
++ if $GNUMAKE -C $i -I ../../src/runtime test 2>&1 && touch $i/test-passed ; then |
74 |
+ : |
75 |
+ else |
76 |
+ exit $? |
77 |
+diff --git a/src/runtime/Config.alpha-linux b/src/runtime/Config.alpha-linux |
78 |
+index 42df1fc..ef140d3 100644 |
79 |
+--- a/src/runtime/Config.alpha-linux |
80 |
++++ b/src/runtime/Config.alpha-linux |
81 |
+@@ -10,7 +10,7 @@ |
82 |
+ # files for more information. |
83 |
+ |
84 |
+ LD = ld -taso |
85 |
+-LINKFLAGS += -dynamic -v -Wl,-T -Wl,ld-script.alpha-linux -rdynamic |
86 |
++LDFLAGS += -dynamic -v -Wl,-T -Wl,ld-script.alpha-linux -rdynamic |
87 |
+ NM = ./linux-nm |
88 |
+ |
89 |
+ ASSEM_SRC = alpha-assem.S ldso-stubs.S |
90 |
+diff --git a/src/runtime/Config.alpha-osf1 b/src/runtime/Config.alpha-osf1 |
91 |
+index 0553f48..8c39543 100644 |
92 |
+--- a/src/runtime/Config.alpha-osf1 |
93 |
++++ b/src/runtime/Config.alpha-osf1 |
94 |
+@@ -9,11 +9,10 @@ |
95 |
+ # provided with absolutely no warranty. See the COPYING and CREDITS |
96 |
+ # files for more information. |
97 |
+ |
98 |
+-CFLAGS += -Dosf1 -O0 -g -D_XOPEN_SOURCE=500 -D_OSF_SOURCE=500 |
99 |
+-CFLAGS += -msg_disable newlocale |
100 |
++CFLAGS += -Dosf1 -O0 -D_XOPEN_SOURCE=500 -D_OSF_SOURCE=500 -msg_disable newlocale |
101 |
+ ASFLAGS += -Dosf1 #-ULANGUAGE_ASSEMBLY |
102 |
+ LD = ld -xtaso |
103 |
+-LINKFLAGS = -non_shared # dynamic -v -g -Wl,-T -Wl,ld-script.alpha-linux |
104 |
++LDFLAGS += -non_shared # dynamic -v -g -Wl,-T -Wl,ld-script.alpha-linux |
105 |
+ # Digital^WCompaq^WHP's cc declares `static inline' functions to exist |
106 |
+ # in multiple places in the binary; we add the '-g' flag to suppress all |
107 |
+ # internal (i.e. static) function names being spat out. GENESIS |
108 |
+diff --git a/src/runtime/Config.hppa-hpux b/src/runtime/Config.hppa-hpux |
109 |
+index fec282b..7509a60 100644 |
110 |
+--- a/src/runtime/Config.hppa-hpux |
111 |
++++ b/src/runtime/Config.hppa-hpux |
112 |
+@@ -9,7 +9,7 @@ |
113 |
+ # provided with absolutely no warranty. See the COPYING and CREDITS |
114 |
+ # files for more information. |
115 |
+ |
116 |
+-LINKFLAGS += -v |
117 |
++LDFLAGS += -v |
118 |
+ # avoid native tools |
119 |
+ NM = /usr/local/bin/nm |
120 |
+ CC = /usr/local/bin/gcc |
121 |
+diff --git a/src/runtime/Config.hppa-linux b/src/runtime/Config.hppa-linux |
122 |
+index 72449bd..4637c5c 100644 |
123 |
+--- a/src/runtime/Config.hppa-linux |
124 |
++++ b/src/runtime/Config.hppa-linux |
125 |
+@@ -9,7 +9,7 @@ |
126 |
+ # provided with absolutely no warranty. See the COPYING and CREDITS |
127 |
+ # files for more information. |
128 |
+ |
129 |
+-LINKFLAGS += -v -static |
130 |
++LDFLAGS += -v -static |
131 |
+ NM = ./linux-nm |
132 |
+ |
133 |
+ ASSEM_SRC = hppa-assem.S #hppa-linux-stubs.S |
134 |
+diff --git a/src/runtime/Config.mips-linux b/src/runtime/Config.mips-linux |
135 |
+index 9f32f3c..01f13bc 100644 |
136 |
+--- a/src/runtime/Config.mips-linux |
137 |
++++ b/src/runtime/Config.mips-linux |
138 |
+@@ -9,7 +9,7 @@ |
139 |
+ # provided with absolutely no warranty. See the COPYING and CREDITS |
140 |
+ # files for more information. |
141 |
+ |
142 |
+-LINKFLAGS += -v -O2 -Wl,--export-dynamic |
143 |
++LDFLAGS += -v -O2 -Wl,--export-dynamic |
144 |
+ NM = ./linux-nm |
145 |
+ |
146 |
+ ASSEM_SRC = mips-assem.S ldso-stubs.S |
147 |
+diff --git a/src/runtime/Config.ppc-darwin b/src/runtime/Config.ppc-darwin |
148 |
+index 0d3d79a..ea3eaf7 100644 |
149 |
+--- a/src/runtime/Config.ppc-darwin |
150 |
++++ b/src/runtime/Config.ppc-darwin |
151 |
+@@ -9,8 +9,8 @@ |
152 |
+ # provided with absolutely no warranty. See the COPYING and CREDITS |
153 |
+ # files for more information. |
154 |
+ |
155 |
+-CFLAGS = -g -Wall -O2 -fdollars-in-identifiers -mmacosx-version-min=10.4 |
156 |
+-LINKFLAGS += -mmacosx-version-min=10.4 |
157 |
++CFLAGS += -O2 -fdollars-in-identifiers -mmacosx-version-min=10.4 |
158 |
++LDFLAGS += -mmacosx-version-min=10.4 |
159 |
+ |
160 |
+ OS_SRC = bsd-os.c darwin-os.c ppc-darwin-os.c |
161 |
+ |
162 |
+diff --git a/src/runtime/Config.ppc-linux b/src/runtime/Config.ppc-linux |
163 |
+index f8ceded..0bfe84a 100644 |
164 |
+--- a/src/runtime/Config.ppc-linux |
165 |
++++ b/src/runtime/Config.ppc-linux |
166 |
+@@ -9,8 +9,7 @@ |
167 |
+ # provided with absolutely no warranty. See the COPYING and CREDITS |
168 |
+ # files for more information. |
169 |
+ |
170 |
+-CFLAGS = -g |
171 |
+-LINKFLAGS += -v -rdynamic |
172 |
++LDFLAGS += -v -rdynamic |
173 |
+ NM = ./linux-nm |
174 |
+ |
175 |
+ ASSEM_SRC = ppc-assem.S ldso-stubs.S |
176 |
+diff --git a/src/runtime/Config.ppc-netbsd b/src/runtime/Config.ppc-netbsd |
177 |
+index 07f668e..a17ebc7 100644 |
178 |
+--- a/src/runtime/Config.ppc-netbsd |
179 |
++++ b/src/runtime/Config.ppc-netbsd |
180 |
+@@ -9,8 +9,8 @@ |
181 |
+ # provided with absolutely no warranty. See the COPYING and CREDITS |
182 |
+ # files for more information. |
183 |
+ |
184 |
+-LINKFLAGS += -dynamic -export-dynamic |
185 |
+-CFLAGS = -g -Wall -O2 |
186 |
++LDFLAGS += -dynamic -export-dynamic |
187 |
++CFLAGS += -O2 |
188 |
+ |
189 |
+ ASSEM_SRC = ppc-assem.S ldso-stubs.S |
190 |
+ ARCH_SRC = ppc-arch.c |
191 |
+diff --git a/src/runtime/Config.sparc-linux b/src/runtime/Config.sparc-linux |
192 |
+index 1ad0213..96af999 100644 |
193 |
+--- a/src/runtime/Config.sparc-linux |
194 |
++++ b/src/runtime/Config.sparc-linux |
195 |
+@@ -9,8 +9,7 @@ |
196 |
+ # provided with absolutely no warranty. See the COPYING and CREDITS |
197 |
+ # files for more information. |
198 |
+ |
199 |
+-ASFLAGS = -g -Wall |
200 |
+-LINKFLAGS += -v -rdynamic |
201 |
++LDFLAGS += -v -rdynamic |
202 |
+ NM = ./linux-nm |
203 |
+ |
204 |
+ ASSEM_SRC = sparc-assem.S ldso-stubs.S |
205 |
+diff --git a/src/runtime/Config.sparc-netbsd b/src/runtime/Config.sparc-netbsd |
206 |
+index ec95cf8..7ca8cab 100644 |
207 |
+--- a/src/runtime/Config.sparc-netbsd |
208 |
++++ b/src/runtime/Config.sparc-netbsd |
209 |
+@@ -10,8 +10,8 @@ |
210 |
+ # files for more information. |
211 |
+ |
212 |
+ CC = gcc |
213 |
+-CFLAGS += -g -Wall -O2 |
214 |
+-LINKFLAGS += -v |
215 |
++CFLAGS += -O2 |
216 |
++LDFLAGS += -v |
217 |
+ NM = nm -t x -p |
218 |
+ |
219 |
+ ASSEM_SRC = sparc-assem.S ldso-stubs.S |
220 |
+diff --git a/src/runtime/Config.sparc-sunos b/src/runtime/Config.sparc-sunos |
221 |
+index c5c89b8..7ca56e8 100644 |
222 |
+--- a/src/runtime/Config.sparc-sunos |
223 |
++++ b/src/runtime/Config.sparc-sunos |
224 |
+@@ -11,8 +11,8 @@ |
225 |
+ |
226 |
+ CC = gcc |
227 |
+ CFLAGS += -DSVR4 -D_REENTRANT |
228 |
+-ASFLAGS = -g -Wall -DSVR4 |
229 |
+-LINKFLAGS += -v |
230 |
++ASFLAGS += -DSVR4 |
231 |
++LDFLAGS += -v |
232 |
+ NM = nm -t x -p |
233 |
+ |
234 |
+ ASSEM_SRC = sparc-assem.S ldso-stubs.S |
235 |
+diff --git a/src/runtime/Config.x86-64-darwin b/src/runtime/Config.x86-64-darwin |
236 |
+index 24965f5..efecb06 100644 |
237 |
+--- a/src/runtime/Config.x86-64-darwin |
238 |
++++ b/src/runtime/Config.x86-64-darwin |
239 |
+@@ -9,13 +9,15 @@ |
240 |
+ # provided with absolutely no warranty. See the COPYING and CREDITS |
241 |
+ # files for more information. |
242 |
+ |
243 |
+-CFLAGS = -g -Wall -O2 -fdollars-in-identifiers |
244 |
++CFLAGS += -arch x86_64 -O2 -fdollars-in-identifier |
245 |
++LDFLAGS += -arch x86_64 |
246 |
++ |
247 |
+ ifdef LISP_FEATURE_DARWIN9_OR_BETTER |
248 |
+ CFLAGS += -mmacosx-version-min=10.5 |
249 |
+-LINKFLAGS += -mmacosx-version-min=10.5 |
250 |
++LDFLAGS += -mmacosx-version-min=10.5 |
251 |
+ else |
252 |
+ CFLAGS += -mmacosx-version-min=10.4 |
253 |
+-LINKFLAGS += -mmacosx-version-min=10.4 |
254 |
++LDFLAGS += -mmacosx-version-min=10.4 |
255 |
+ endif |
256 |
+ ifdef LISP_FEATURE_INODE64 |
257 |
+ CFLAGS += -D_DARWIN_USE_64_BIT_INODE |
258 |
+@@ -31,9 +33,9 @@ endif |
259 |
+ ASSEM_SRC = x86-64-assem.S ldso-stubs.S |
260 |
+ ARCH_SRC = x86-64-arch.c |
261 |
+ |
262 |
+-LINKFLAGS += -arch x86_64 -dynamic -twolevel_namespace -bind_at_load -pagezero_size 0x100000 |
263 |
++LDFLAGS += -dynamic -twolevel_namespace -bind_at_load -pagezero_size 0x100000 |
264 |
+ |
265 |
+-CFLAGS += -arch x86_64 -fno-omit-frame-pointer -pagezero_size 0x100000 |
266 |
++CFLAGS += -fno-omit-frame-pointer -pagezero_size 0x100000 |
267 |
+ |
268 |
+ GC_SRC = gencgc.c |
269 |
+ |
270 |
+diff --git a/src/runtime/Config.x86-64-freebsd b/src/runtime/Config.x86-64-freebsd |
271 |
+index cb35476..2945aa5 100644 |
272 |
+--- a/src/runtime/Config.x86-64-freebsd |
273 |
++++ b/src/runtime/Config.x86-64-freebsd |
274 |
+@@ -13,11 +13,11 @@ include Config.x86-64-bsd |
275 |
+ |
276 |
+ ASSEM_SRC += ldso-stubs.S |
277 |
+ |
278 |
+-# Until sbcl-0.6.7.3, we used "LINKFLAGS+=-static" here, which |
279 |
++# Until sbcl-0.6.7.3, we used "LDFLAGS+=-static" here, which |
280 |
+ # worked fine for most things, but LOAD-FOREIGN & friends require |
281 |
+ # dlopen() etc., which in turn depend on dynamic linking of the |
282 |
+ # runtime. |
283 |
+-LINKFLAGS += -dynamic -export-dynamic |
284 |
++LDFLAGS += -dynamic -export-dynamic |
285 |
+ |
286 |
+ # use libthr (1:1 threading). libpthread (m:n threading) does not work. |
287 |
+ ifdef LISP_FEATURE_SB_THREAD |
288 |
+diff --git a/src/runtime/Config.x86-64-netbsd b/src/runtime/Config.x86-64-netbsd |
289 |
+index e893ee0..41e66ba 100644 |
290 |
+--- a/src/runtime/Config.x86-64-netbsd |
291 |
++++ b/src/runtime/Config.x86-64-netbsd |
292 |
+@@ -14,9 +14,4 @@ include Config.x86-64-bsd |
293 |
+ ASSEM_SRC += ldso-stubs.S |
294 |
+ OS_LIBS += -lutil |
295 |
+ |
296 |
+-# XXX why do all the other Configs set LINKFLAGS instead of LDFLAGS? |
297 |
+-# LINKFLAGS is only used in src/runtime/GNUmakefile, this causes the |
298 |
+-# dladdr test in tools-for-build/ to fail. |
299 |
+- |
300 |
+-LINKFLAGS += -export-dynamic |
301 |
+ LDFLAGS += -export-dynamic |
302 |
+diff --git a/src/runtime/Config.x86-64-openbsd b/src/runtime/Config.x86-64-openbsd |
303 |
+index e893ee0..41e66ba 100644 |
304 |
+--- a/src/runtime/Config.x86-64-openbsd |
305 |
++++ b/src/runtime/Config.x86-64-openbsd |
306 |
+@@ -14,9 +14,4 @@ include Config.x86-64-bsd |
307 |
+ ASSEM_SRC += ldso-stubs.S |
308 |
+ OS_LIBS += -lutil |
309 |
+ |
310 |
+-# XXX why do all the other Configs set LINKFLAGS instead of LDFLAGS? |
311 |
+-# LINKFLAGS is only used in src/runtime/GNUmakefile, this causes the |
312 |
+-# dladdr test in tools-for-build/ to fail. |
313 |
+- |
314 |
+-LINKFLAGS += -export-dynamic |
315 |
+ LDFLAGS += -export-dynamic |
316 |
+diff --git a/src/runtime/Config.x86-64-sunos b/src/runtime/Config.x86-64-sunos |
317 |
+index 8441cef..208a4f7 100644 |
318 |
+--- a/src/runtime/Config.x86-64-sunos |
319 |
++++ b/src/runtime/Config.x86-64-sunos |
320 |
+@@ -1,14 +1,14 @@ |
321 |
+ CC=gcc |
322 |
+-CFLAGS = -m64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer |
323 |
+-ASFLAGS = -m64 -Wall |
324 |
++CFLAGS += -m64 -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer |
325 |
++ASFLAGS += -m64 |
326 |
+ LD = ld |
327 |
+-LINKFLAGS = -m64 -g |
328 |
++LDFLAGS += -m64 -g |
329 |
+ NM = nm -xgp |
330 |
+ GREP = ggrep |
331 |
+ |
332 |
+ #CC=/opt/SunStudioExpress/bin/cc |
333 |
+-#CFLAGS = -xarch=generic64 -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer |
334 |
+-#ASFLAGS = -xarch=generic64 -Wall |
335 |
++#CFLAGS += -xarch=generic64 -g -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT -fno-omit-frame-pointer |
336 |
++#ASFLAGS += -xarch=generic64 |
337 |
+ |
338 |
+ ASSEM_SRC = x86-64-assem.S ldso-stubs.S |
339 |
+ ARCH_SRC = x86-64-arch.c |
340 |
+diff --git a/src/runtime/Config.x86-darwin b/src/runtime/Config.x86-darwin |
341 |
+index c1a3eb7..578f91a 100644 |
342 |
+--- a/src/runtime/Config.x86-darwin |
343 |
++++ b/src/runtime/Config.x86-darwin |
344 |
+@@ -9,14 +9,15 @@ |
345 |
+ # provided with absolutely no warranty. See the COPYING and CREDITS |
346 |
+ # files for more information. |
347 |
+ |
348 |
+-CFLAGS = -arch i386 -g -Wall -O2 -fdollars-in-identifiers |
349 |
+-LINKFLAGS += -arch i386 |
350 |
++CFLAGS += -arch i386 -g -Wall -O2 -fdollars-in-identifiers |
351 |
++LDFLAGS += -arch i386 |
352 |
++ |
353 |
+ ifdef LISP_FEATURE_DARWIN9_OR_BETTER |
354 |
+ CFLAGS += -mmacosx-version-min=10.5 |
355 |
+-LINKFLAGS += -mmacosx-version-min=10.5 |
356 |
++LDFLAGS += -mmacosx-version-min=10.5 |
357 |
+ else |
358 |
+ CFLAGS += -mmacosx-version-min=10.4 |
359 |
+-LINKFLAGS += -mmacosx-version-min=10.4 |
360 |
++LDFLAGS += -mmacosx-version-min=10.4 |
361 |
+ endif |
362 |
+ |
363 |
+ OS_SRC = bsd-os.c x86-bsd-os.c darwin-os.c x86-darwin-os.c |
364 |
+diff --git a/src/runtime/Config.x86-freebsd b/src/runtime/Config.x86-freebsd |
365 |
+index a7533b6..2b4b8bd 100644 |
366 |
+--- a/src/runtime/Config.x86-freebsd |
367 |
++++ b/src/runtime/Config.x86-freebsd |
368 |
+@@ -13,11 +13,11 @@ include Config.x86-bsd |
369 |
+ |
370 |
+ ASSEM_SRC += ldso-stubs.S |
371 |
+ |
372 |
+-# Until sbcl-0.6.7.3, we used "LINKFLAGS+=-static" here, which |
373 |
++# Until sbcl-0.6.7.3, we used "LDFLAGS+=-static" here, which |
374 |
+ # worked fine for most things, but LOAD-FOREIGN & friends require |
375 |
+ # dlopen() etc., which in turn depend on dynamic linking of the |
376 |
+ # runtime. |
377 |
+-LINKFLAGS += -dynamic -export-dynamic |
378 |
++LDFLAGS += -dynamic -export-dynamic |
379 |
+ |
380 |
+ # use libthr (1:1 threading). libpthread (m:n threading) does not work. |
381 |
+ ifdef LISP_FEATURE_SB_THREAD |
382 |
+diff --git a/src/runtime/Config.x86-linux b/src/runtime/Config.x86-linux |
383 |
+index d64a779..5c3bfe7 100644 |
384 |
+--- a/src/runtime/Config.x86-linux |
385 |
++++ b/src/runtime/Config.x86-linux |
386 |
+@@ -27,11 +27,11 @@ OS_SRC = linux-os.c x86-linux-os.c |
387 |
+ # (You *are* encouraged to design and implement a coherent stable |
388 |
+ # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is |
389 |
+ # working on one and it would be a nice thing to have.) |
390 |
+-LINKFLAGS += -Wl,--export-dynamic |
391 |
++SBCL_LDFLAGS += -Wl,--export-dynamic |
392 |
+ OS_LIBS = -ldl |
393 |
+ |
394 |
+ ifdef LISP_FEATURE_LARGEFILE |
395 |
+- CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
396 |
++ SBCL_CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
397 |
+ endif |
398 |
+ |
399 |
+ ifdef LISP_FEATURE_SB_THREAD |
400 |
+diff --git a/src/runtime/Config.x86-netbsd b/src/runtime/Config.x86-netbsd |
401 |
+index cd3782c..b0cd748 100644 |
402 |
+--- a/src/runtime/Config.x86-netbsd |
403 |
++++ b/src/runtime/Config.x86-netbsd |
404 |
+@@ -13,6 +13,6 @@ include Config.x86-bsd |
405 |
+ |
406 |
+ ASSEM_SRC += ldso-stubs.S |
407 |
+ OS_SRC += undefineds.c |
408 |
+-LINKFLAGS += -dynamic -export-dynamic |
409 |
++LDFLAGS += -dynamic -export-dynamic |
410 |
+ |
411 |
+-CFLAGS = -g -Wall -O2 |
412 |
++CFLAGS += -O2 |
413 |
+diff --git a/src/runtime/Config.x86-openbsd b/src/runtime/Config.x86-openbsd |
414 |
+index b55c794..b98d701 100644 |
415 |
+--- a/src/runtime/Config.x86-openbsd |
416 |
++++ b/src/runtime/Config.x86-openbsd |
417 |
+@@ -18,11 +18,6 @@ OS_LIBS += -lutil |
418 |
+ # locations used. If you wish to link the runtime using -Z option then |
419 |
+ # please see the comments in src/compiler/x86/parms.lisp |
420 |
+ |
421 |
+-# XXX why do all the other Configs set LINKFLAGS instead of LDFLAGS? |
422 |
+-# LINKFLAGS is only used in src/runtime/GNUmakefile, this causes the |
423 |
+-# dladdr test in tools-for-build/ to fail. |
424 |
+- |
425 |
+-LINKFLAGS += -export-dynamic |
426 |
+ LDFLAGS += -export-dynamic |
427 |
+ |
428 |
+-CFLAGS = -g -Wall -O2 |
429 |
++CFLAGS += -O2 |
430 |
+diff --git a/src/runtime/Config.x86-sunos b/src/runtime/Config.x86-sunos |
431 |
+index 2e58b51..fbb41aa 100644 |
432 |
+--- a/src/runtime/Config.x86-sunos |
433 |
++++ b/src/runtime/Config.x86-sunos |
434 |
+@@ -1,6 +1,5 @@ |
435 |
+ CC=gcc |
436 |
+-CFLAGS = -g -O2 -Wall -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT |
437 |
+-ASFLAGS = -Wall |
438 |
++CFLAGS += -O2 -D__EXTENSIONS__ -D_POSIX_C_SOURCE=199506L -DSVR4 -D_REENTRANT |
439 |
+ LD = ld |
440 |
+ NM = nm -xgp |
441 |
+ GREP = ggrep |
442 |
+diff --git a/src/runtime/Config.x86-win32 b/src/runtime/Config.x86-win32 |
443 |
+index b341808..8d24df6 100644 |
444 |
+--- a/src/runtime/Config.x86-win32 |
445 |
++++ b/src/runtime/Config.x86-win32 |
446 |
+@@ -25,13 +25,13 @@ OS_SRC = win32-os.c x86-win32-os.c os-common.c |
447 |
+ # (You *are* encouraged to design and implement a coherent stable |
448 |
+ # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is |
449 |
+ # working on one and it would be a nice thing to have.) |
450 |
+-OS_LINK_FLAGS = -Wl,--export-dynamic,-mno-cygwin |
451 |
++OS_LINK_FLAGS += -Wl,--export-dynamic,-mno-cygwin |
452 |
+ OS_LIBS = -mno-cygwin |
453 |
+ |
454 |
+ GC_SRC = gencgc.c |
455 |
+ |
456 |
+-CFLAGS = -g -Wall -O3 -mno-cygwin |
457 |
+-ASFLAGS = $(CFLAGS) |
458 |
++CFLAGS += -O3 -mno-cygwin |
459 |
++ASFLAGS += $(CFLAGS) |
460 |
+ |
461 |
+ CPP = cpp |
462 |
+ CC = gcc-3 |
463 |
+diff --git a/src/runtime/Config.x86_64-linux b/src/runtime/Config.x86_64-linux |
464 |
+index e1efb79..b17bfd4 100644 |
465 |
+--- a/src/runtime/Config.x86_64-linux |
466 |
++++ b/src/runtime/Config.x86_64-linux |
467 |
+@@ -27,7 +27,7 @@ OS_SRC = linux-os.c x86-64-linux-os.c |
468 |
+ # (You *are* encouraged to design and implement a coherent stable |
469 |
+ # interface, though.:-| As far as I (WHN 2002-05-19) know, no one is |
470 |
+ # working on one and it would be a nice thing to have.) |
471 |
+-LINKFLAGS += -Wl,--export-dynamic |
472 |
++LDFLAGS += -Wl,--export-dynamic |
473 |
+ OS_LIBS = -ldl |
474 |
+ |
475 |
+ ifdef LISP_FEATURE_LARGEFILE |
476 |
+diff --git a/src/runtime/GNUmakefile b/src/runtime/GNUmakefile |
477 |
+index f0fbe19..6dc0581 100644 |
478 |
+--- a/src/runtime/GNUmakefile |
479 |
++++ b/src/runtime/GNUmakefile |
480 |
+@@ -18,27 +18,19 @@ TARGET=sbcl |
481 |
+ # Config file. Most of them are same on most systems right now. |
482 |
+ # If you need to override one of these, do it in Config. |
483 |
+ LD = ld |
484 |
+-LINKFLAGS = -g |
485 |
++SBCL_LDFLAGS = -g |
486 |
+ NM = nm -gp |
487 |
+ DEPEND_FLAGS = -MM |
488 |
+ GREP = grep |
489 |
+ |
490 |
+ include ../../output/prefix.def |
491 |
+ |
492 |
+-CFLAGS = -g -Wall -Wsign-compare -O3 |
493 |
+-ASFLAGS = $(CFLAGS) |
494 |
+-CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\" |
495 |
++SBCL_CFLAGS = -g -Wall -Wsign-compare -O3 |
496 |
++SBCL_ASFLAGS = $(SBCL_CFLAGS) |
497 |
++SBCL_CPPFLAGS = -I. -DSBCL_PREFIX=\"$(SBCL_PREFIX)\" |
498 |
+ |
499 |
+-# Give make access to the target Lisp features. |
500 |
+-include genesis/Makefile.features |
501 |
+- |
502 |
+-# The Config file is the preferred place for tweaking options which |
503 |
+-# are appropriate for particular setups (OS, ARCH, whatever). Make a |
504 |
+-# Config-foo file for setup foo, then arrange for Config to be a |
505 |
+-# symlink to Config-foo. |
506 |
+-# Commonly used variables in Config are: ARCH_SRC, ASSEM_SRC, GC_SRC, |
507 |
+-# OS_SRC, OS_LIBS, OS_OBJS, OS_CLEAN_FILES |
508 |
+-include Config |
509 |
++# Also included by tools-for-build/Makefile |
510 |
++-include platform.mk |
511 |
+ |
512 |
+ COMMON_SRC = alloc.c backtrace.c breakpoint.c coreparse.c \ |
513 |
+ dynbind.c funcall.c gc-common.c globals.c interr.c interrupt.c \ |
514 |
+@@ -58,7 +50,7 @@ LIBS = ${OS_LIBS} -lm |
515 |
+ targets: $(TARGET) sbcl.nm |
516 |
+ |
517 |
+ $(TARGET): $(OBJS) |
518 |
+- $(CC) ${LINKFLAGS} -o $@ $^ $(LIBS) |
519 |
++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) |
520 |
+ |
521 |
+ sbcl.nm: $(TARGET) |
522 |
+ $(NM) $(TARGET) | $(GREP) -v " [FUw] " > ,$@ |
523 |
+diff --git a/src/runtime/platform.mk b/src/runtime/platform.mk |
524 |
+new file mode 100644 |
525 |
+index 0000000..d2470cd |
526 |
+--- /dev/null |
527 |
++++ b/src/runtime/platform.mk |
528 |
+@@ -0,0 +1,17 @@ |
529 |
++# -*- makefile -*- for the C-level run-time support for SBCL |
530 |
++ |
531 |
++# Give make access to the target Lisp features. |
532 |
++-include genesis/Makefile.features |
533 |
++ |
534 |
++# The Config file is the preferred place for tweaking options which |
535 |
++# are appropriate for particular setups (OS, ARCH, whatever). Make a |
536 |
++# Config-foo file for setup foo, then arrange for Config to be a |
537 |
++# symlink to Config-foo. |
538 |
++# Commonly used variables in Config are: ARCH_SRC, ASSEM_SRC, GC_SRC, |
539 |
++# OS_SRC, OS_LIBS, OS_OBJS, OS_CLEAN_FILES |
540 |
++-include Config |
541 |
++ |
542 |
++CPPFLAGS := $(SBCL_CPPFLAGS) $(CPPFLAGS) |
543 |
++CFLAGS := $(SBCL_CFLAGS) $(CFLAGS) |
544 |
++ASFLAGS := $(SBCL_ASFLAGS) $(ASFLAGS) |
545 |
++LDFLAGS := $(SBCL_LDFLAGS) $(LDFLAGS) |
546 |
+diff --git a/tools-for-build/Makefile b/tools-for-build/Makefile |
547 |
+index 7a4c16f..dc99ebc 100644 |
548 |
+--- a/tools-for-build/Makefile |
549 |
++++ b/tools-for-build/Makefile |
550 |
+@@ -7,12 +7,11 @@ |
551 |
+ # provided with absolutely no warranty. See the COPYING and CREDITS |
552 |
+ # files for more information. |
553 |
+ |
554 |
+--include genesis/Makefile.features |
555 |
+--include Config |
556 |
++SBCL_CPPFLAGS = -I../src/runtime |
557 |
++SBCL_LDFLAGS = $(OS_LIBS) |
558 |
+ |
559 |
+-CPPFLAGS:=-I../src/runtime |
560 |
+-LDFLAGS:=$(LDFLAGS) |
561 |
+-LDLIBS:=$(OS_LIBS) |
562 |
++# from src/runtime/ |
563 |
++-include platform.mk |
564 |
+ |
565 |
+ all: grovel-headers determine-endianness where-is-mcontext \ |
566 |
+ modify-ldt-struct-name sigaction-sa-nodefer-works-test |
567 |
|
568 |
diff --git a/dev-lisp/sbcl/sbcl-1.0.45.ebuild b/dev-lisp/sbcl/sbcl-1.0.47.ebuild |
569 |
similarity index 99% |
570 |
rename from dev-lisp/sbcl/sbcl-1.0.45.ebuild |
571 |
rename to dev-lisp/sbcl/sbcl-1.0.47.ebuild |
572 |
index 527f51e..f4f6f69 100644 |
573 |
--- a/dev-lisp/sbcl/sbcl-1.0.45.ebuild |
574 |
+++ b/dev-lisp/sbcl/sbcl-1.0.47.ebuild |
575 |
@@ -104,7 +104,6 @@ src_compile() { |
576 |
local bindir="${WORKDIR}"/sbcl-binary |
577 |
|
578 |
strip-unsupported-flags ; filter-flags -fomit-frame-pointer |
579 |
- append-ldflags -Wl,--no-as-needed # see bug #132992 |
580 |
|
581 |
# To make the hardened compiler NOT compile with -fPIE -pie |
582 |
if gcc-specs-pie ; then |