From: Christophe R. <cr...@us...> - 2003-11-29 20:41:50
|
Update of /cvsroot/sbcl/sbcl/contrib/sb-posix In directory sc8-pr-cvs1:/tmp/cvs-serv21964/contrib/sb-posix Modified Files: sb-posix.asd Log Message: 0.8.6.14: Ouch. That was hard work. ... contrib fix primarily for SunOS but also I think for Darwin; at least, if it was working it was only by accident. ... uname -m never returns either "solaris" or "darwin", so that code was wrong to start with; ... change the protocol so that we do EXTRA_CFLAGS rather than a complete override; now we don't need the solaris or darwin clauses in asdf-module.mk that weren't being used anyway; ... delete more stuff in make-target-contrib.sh so that we can actually see the effect of these changes rather than blindly reusing an old alien.so (which explains why I hadn't noticed this before, *sigh*; I ran a completely clean build on Solaris for the first time in months yesterday) ... now sb-bsd-sockets and dependents work again. I hope I haven't broken x86-64 in the process. Index: sb-posix.asd =================================================================== RCS file: /cvsroot/sbcl/sbcl/contrib/sb-posix/sb-posix.asd,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- sb-posix.asd 28 Nov 2003 23:07:26 -0000 1.8 +++ sb-posix.asd 29 Nov 2003 20:41:47 -0000 1.9 @@ -33,11 +33,12 @@ (unless (zerop (run-shell-command "gcc ~A -o ~S ~{~S ~}" - (if (sb-ext:posix-getenv "LDFLAGS") - (sb-ext:posix-getenv "LDFLAGS") - #+sunos "-shared -lresolv -lsocket -lnsl" - #+darwin "-bundle" - #-(or darwin sunos) "-shared") + (concatenate 'string + (sb-ext:posix-getenv "EXTRA_LDFLAGS") + " " + #+sunos "-shared -lresolv -lsocket -lnsl" + #+darwin "-bundle" + #-(or darwin sunos) "-shared") dso-name (mapcar #'unix-name (mapcan (lambda (c) @@ -54,9 +55,11 @@ (defmethod perform ((op compile-op) (c c-source-file)) (unless (= 0 (run-shell-command "gcc ~A -o ~S -c ~S" - (if (sb-ext:posix-getenv "CFLAGS") - (sb-ext:posix-getenv "CFLAGS") - "-fPIC") + (concatenate + 'string + (sb-ext:posix-getenv "EXTRA_CFLAGS") + " " + "-fPIC") (unix-name (car (output-files op c))) (unix-name (component-pathname c)))) (error 'operation-error :operation op :component c))) @@ -69,7 +72,6 @@ (let ((filename (car (output-files co c)))) #+cmu (ext:load-foreign filename) #+sbcl (sb-alien:load-1-foreign filename)))) - (defsystem sb-posix :depends-on (sb-grovel) |