forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
/
gentoo-fix-asd.patch
303 lines (297 loc) · 11 KB
/
gentoo-fix-asd.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
diff -ur clx-0.7.4.orig/clx.asd clx-0.7.4/clx.asd
--- clx-0.7.4.orig/clx.asd 2009-11-28 16:43:30.000000000 +0100
+++ clx-0.7.4/clx.asd 2009-11-29 22:29:11.000000000 +0100
@@ -21,116 +21,80 @@
;;; or implied warranty.
(defpackage :clx-system (:use :cl :asdf))
-(in-package :clx-system)
+(in-package :clx-system)
(pushnew :clx-ansi-common-lisp *features*)
(defclass clx-source-file (cl-source-file) ())
(defclass xrender-source-file (clx-source-file) ())
-;;; CL-SOURCE-FILE, not CLX-SOURCE-FILE, so that we're not accused of
-;;; cheating by rebinding *DERIVE-FUNCTION-TYPES* :-)
-(defclass example-source-file (cl-source-file) ())
-
-(defclass legacy-file (static-file) ())
-
-(defsystem CLX
- :depends-on (#+sbcl sb-bsd-sockets)
- :version "0.7.2"
- :serial t
- :default-component-class clx-source-file
+(defsystem clx
+ :depends-on (#+sbcl :sb-bsd-sockets)
+ :version "0.7.4"
+ :serial t
+ :default-component-class clx-source-file
+ :components
+ ((:file "package")
+ (:file "depdefs")
+ (:file "clx")
+ #-(or openmcl allegro) (:file "dependent")
+ #+openmcl (:file "dep-openmcl")
+ #+allegro (:file "dep-allegro")
+ (:file "macros")
+ (:file "bufmac")
+ (:file "buffer")
+ (:file "display")
+ (:file "gcontext")
+ (:file "input")
+ (:file "requests")
+ (:file "fonts")
+ (:file "graphics")
+ (:file "text")
+ (:file "attributes")
+ (:file "translate")
+ (:file "keysyms")
+ (:file "manager")
+ (:file "image")
+ (:file "resource")
+ #+allegro
+ (:file "excldep" :pathname "excldep.lisp")
+ (:module extensions
+ :pathname #.(make-pathname :directory '(:relative))
:components
- ((:file "package")
- (:file "depdefs")
- (:file "clx")
- #-(or openmcl allegro) (:file "dependent")
- #+openmcl (:file "dep-openmcl")
- #+allegro (:file "dep-allegro")
- (:file "macros")
- (:file "bufmac")
- (:file "buffer")
- (:file "display")
- (:file "gcontext")
- (:file "input")
- (:file "requests")
- (:file "fonts")
- (:file "graphics")
- (:file "text")
- (:file "attributes")
- (:file "translate")
- (:file "keysyms")
- (:file "manager")
- (:file "image")
- (:file "resource")
- #+allegro
- (:file "excldep" :pathname "excldep.lisp")
- (:module extensions
- :pathname #.(make-pathname :directory '(:relative))
- :components
- ((:file "shape")
- (:file "big-requests")
- (:file "xvidmode")
- (:xrender-source-file "xrender")
- (:file "glx")
- (:file "gl" :depends-on ("glx"))
- (:file "dpms")
- (:file "xtest")
- (:file "screensaver")
- (:file "xinerama")))
- (:module demo
- :default-component-class example-source-file
- :components
- ((:file "bezier")
- ;; KLUDGE: this requires "bezier" for proper operation,
- ;; but we don't declare that dependency here, because
- ;; asdf doesn't load example files anyway.
- (:file "beziertest")
- (:file "clclock")
- (:file "clipboard")
- (:file "clx-demos")
- (:file "gl-test")
- ;; FIXME: compiling this generates 30-odd spurious code
- ;; deletion notes. Find out why, and either fix or
- ;; workaround the problem.
- (:file "mandel")
- (:file "menu")
- (:file "zoid")))
- (:module test
- :default-component-class example-source-file
- :components
- ((:file "image")
- ;; KLUDGE: again, this depends on "zoid"
- (:file "trapezoid")))
- (:static-file "NEWS")
- (:static-file "CHANGES")
- (:static-file "README")
- (:static-file "README-R5")
- (:legacy-file "exclMakefile")
- (:legacy-file "exclREADME")
- (:legacy-file "exclcmac" :pathname "exclcmac.lisp")
- (:legacy-file "excldepc" :pathname "excldep.c")
- (:legacy-file "sockcl" :pathname "sockcl.lisp")
- (:legacy-file "socket" :pathname "socket.c")
- (:legacy-file "defsystem" :pathname "defsystem.lisp")
- (:legacy-file "provide" :pathname "provide.lisp")
- (:legacy-file "cmudep" :pathname "cmudep.lisp")
- (:module manual
- ;; TODO: teach asdf how to process texinfo files
- :components ((:static-file "clx.texinfo")))
- (:module debug
- :default-component-class legacy-file
- :components
- ((:file "debug" :pathname "debug.lisp")
- (:file "describe" :pathname "describe.lisp")
- (:file "event-test" :pathname "event-test.lisp")
- (:file "keytrans" :pathname "keytrans.lisp")
- (:file "trace" :pathname "trace.lisp")
- (:file "util" :pathname "util.lisp")))))
-
-(defmethod perform ((o load-op) (f example-source-file))
- ;; do nothing. We want to compile them when CLX is compiled, but
- ;; not load them when CLX is loaded.
- t)
+ ((:file "shape")
+ (:file "big-requests")
+ (:file "xvidmode")
+ (:xrender-source-file "xrender")
+ (:file "glx")
+ (:file "gl" :depends-on ("glx"))
+ (:file "dpms")
+ (:file "xtest")
+ (:file "screensaver")
+ (:file "xinerama")))))
+
+(defsystem clx-test
+ :depends-on (:clx)
+ :serial t
+ :components
+ ((:file "image")
+ (:file "trapezoid")))
+
+(defsystem clx-demo
+ :depends-on (:clx)
+ :serial t
+ :components
+ ((:file "bezier")
+ (:file "beziertest")
+ (:file "clclock")
+ (:file "clipboard")
+ (:file "clx-demos")
+ (:file "gl-test")
+ ;; FIXME: compiling this generates 30-odd spurious code
+ ;; deletion notes. Find out why, and either fix or
+ ;; workaround the problem.
+ (:file "mandel")
+ (:file "menu")
+ (:file "zoid")))
#+sbcl
(defmethod perform :around ((o compile-op) (f xrender-source-file))
@@ -146,35 +110,35 @@
;; without STYLE-WARNINGs. Since it currently does, let's enforce
;; it here so that we can catch regressions easily.
(let ((on-warnings (operation-on-warnings o))
- (on-failure (operation-on-failure o)))
+ (on-failure (operation-on-failure o)))
(unwind-protect
- (progn
- (setf (operation-on-warnings o) :error
- (operation-on-failure o) :error)
- ;; a variety of accessors, such as AREF-CARD32, are not
- ;; declared INLINE. Without this (non-ANSI)
- ;; static-type-inference behaviour, SBCL emits an extra 100
- ;; optimization notes (roughly one fifth of all of the
- ;; notes emitted). Since the internals are unlikely to
- ;; change much, and certainly the internals should stay in
- ;; sync, enabling this extension is a win. (Note that the
- ;; use of this does not imply that applications using CLX
- ;; calls that expand into calls to these accessors will be
- ;; optimized in the same way).
- (let ((sb-ext:*derive-function-types* t)
+ (progn
+ (setf (operation-on-warnings o) :error
+ (operation-on-failure o) :error)
+ ;; a variety of accessors, such as AREF-CARD32, are not
+ ;; declared INLINE. Without this (non-ANSI)
+ ;; static-type-inference behaviour, SBCL emits an extra 100
+ ;; optimization notes (roughly one fifth of all of the
+ ;; notes emitted). Since the internals are unlikely to
+ ;; change much, and certainly the internals should stay in
+ ;; sync, enabling this extension is a win. (Note that the
+ ;; use of this does not imply that applications using CLX
+ ;; calls that expand into calls to these accessors will be
+ ;; optimized in the same way).
+ (let ((sb-ext:*derive-function-types* t)
(sadx (find-symbol "STACK-ALLOCATE-DYNAMIC-EXTENT" :sb-c))
(sadx-var (find-symbol "*STACK-ALLOCATE-DYNAMIC-EXTENT*" :sb-ext)))
- ;; deeply unportable stuff, this. I will be shot. We
- ;; want to enable the dynamic-extent declarations in CLX.
- (when (and sadx (sb-c::policy-quality-name-p sadx))
- ;; no way of setting it back short of yet more yukky stuff
- (proclaim `(optimize (,sadx 3))))
+ ;; deeply unportable stuff, this. I will be shot. We
+ ;; want to enable the dynamic-extent declarations in CLX.
+ (when (and sadx (sb-c::policy-quality-name-p sadx))
+ ;; no way of setting it back short of yet more yukky stuff
+ (proclaim `(optimize (,sadx 3))))
(if sadx-var
(progv (list sadx-var) (list t)
(call-next-method))
(call-next-method))))
(setf (operation-on-warnings o) on-warnings
- (operation-on-failure o) on-failure))))
+ (operation-on-failure o) on-failure))))
#+sbcl
(defmethod perform :around (o (f clx-source-file))
@@ -186,31 +150,31 @@
;; structured data is sufficiently equal.
(handler-bind
((sb-ext:defconstant-uneql
- (lambda (c)
- ;; KLUDGE: this really means "don't warn me about
- ;; efficiency of generic array access, please"
- (declare (optimize (sb-ext:inhibit-warnings 3)))
- (let ((old (sb-ext:defconstant-uneql-old-value c))
- (new (sb-ext:defconstant-uneql-new-value c)))
- (typecase old
- (list (when (equal old new) (abort c)))
- (string (when (and (typep new 'string)
- (string= old new))
- (abort c)))
- (simple-vector
- (when (and (typep new 'simple-vector)
- (= (length old) (length new))
- (every #'eql old new))
- (abort c)))
- (array
- (when (and (typep new 'array)
- (equal (array-dimensions old)
- (array-dimensions new))
- (equal (array-element-type old)
- (array-element-type new))
- (dotimes (i (array-total-size old) t)
- (unless (eql (row-major-aref old i)
- (row-major-aref new i))
- (return nil))))
- (abort c))))))))
+ (lambda (c)
+ ;; KLUDGE: this really means "don't warn me about
+ ;; efficiency of generic array access, please"
+ (declare (optimize (sb-ext:inhibit-warnings 3)))
+ (let ((old (sb-ext:defconstant-uneql-old-value c))
+ (new (sb-ext:defconstant-uneql-new-value c)))
+ (typecase old
+ (list (when (equal old new) (abort c)))
+ (string (when (and (typep new 'string)
+ (string= old new))
+ (abort c)))
+ (simple-vector
+ (when (and (typep new 'simple-vector)
+ (= (length old) (length new))
+ (every #'eql old new))
+ (abort c)))
+ (array
+ (when (and (typep new 'array)
+ (equal (array-dimensions old)
+ (array-dimensions new))
+ (equal (array-element-type old)
+ (array-element-type new))
+ (dotimes (i (array-total-size old) t)
+ (unless (eql (row-major-aref old i)
+ (row-major-aref new i))
+ (return nil))))
+ (abort c))))))))
(call-next-method)))