projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.pre8.4
[sbcl.git]
/
contrib
/
sb-bsd-sockets
/
sb-bsd-sockets.asd
diff --git
a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
index
d912524
..
bf946c3
100644
(file)
--- a/
contrib/sb-bsd-sockets/sb-bsd-sockets.asd
+++ b/
contrib/sb-bsd-sockets/sb-bsd-sockets.asd
@@
-28,8
+28,7
@@
(find-package "SB-BSD-SOCKETS-SYSTEM"))
filename tmp-c-source :sb-bsd-sockets-internal)
(and
(find-package "SB-BSD-SOCKETS-SYSTEM"))
filename tmp-c-source :sb-bsd-sockets-internal)
(and
- (= (run-shell-command
- "/usr/bin/gcc -o ~S ~S" (namestring tmp-a-dot-out)
+ (= (run-shell-command "gcc -o ~S ~S" (namestring tmp-a-dot-out)
(namestring tmp-c-source)) 0)
(= (run-shell-command "~A >~A"
(namestring tmp-a-dot-out)
(namestring tmp-c-source)) 0)
(= (run-shell-command "~A >~A"
(namestring tmp-a-dot-out)
@@
-62,7
+61,8
@@
(let ((dso-name (unix-name (car (output-files operation dso)))))
(unless (zerop
(run-shell-command
(let ((dso-name (unix-name (car (output-files operation dso)))))
(unless (zerop
(run-shell-command
- "gcc -shared -o ~S ~{~S ~}"
+ #+sunos "gcc -shared -lresolv -lsocket -lnsl -o ~S ~{~S ~}"
+ #-sunos "gcc -shared -o ~S ~{~S ~} "
dso-name
(mapcar #'unix-name
(mapcan (lambda (c)
dso-name
(mapcar #'unix-name
(mapcan (lambda (c)
@@
-78,7
+78,7
@@
(component-pathname c))))
(defmethod perform ((op compile-op) (c c-source-file))
(unless
(component-pathname c))))
(defmethod perform ((op compile-op) (c c-source-file))
(unless
- (= 0 (run-shell-command "/usr/bin/gcc -fPIC -o ~S -c ~S"
+ (= 0 (run-shell-command "gcc -fPIC -o ~S -c ~S"
(unix-name (car (output-files op c)))
(unix-name (component-pathname c))))
(error 'operation-error :operation op :component c)))
(unix-name (car (output-files op c)))
(unix-name (component-pathname c))))
(error 'operation-error :operation op :component c)))
@@
-111,7
+111,7
@@
(:file "sockopt" :depends-on ("sockets"))
(:file "inet" :depends-on ("sockets" "split" "constants" ))
(:file "sockopt" :depends-on ("sockets"))
(:file "inet" :depends-on ("sockets" "split" "constants" ))
- (:file "unix" :depends-on ("sockets" "split" "constants" ))
+ (:file "local" :depends-on ("sockets" "split" "constants" ))
(:file "name-service" :depends-on ("sockets" "constants" "alien"))
(:file "misc" :depends-on ("sockets" "constants"))
(:file "name-service" :depends-on ("sockets" "constants" "alien"))
(:file "misc" :depends-on ("sockets" "constants"))
@@
-126,3
+126,7
@@
(:static-file "doc" :pathname "doc.lisp")
(:static-file "TODO")))
(:static-file "doc" :pathname "doc.lisp")
(:static-file "TODO")))
+(defmethod perform ((o test-op) (c (eql (find-system :sb-bsd-sockets))))
+ (or (funcall (intern "DO-TESTS" (find-package "RT")))
+ (error "test-op failed")))
+