X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Fsb-bsd-sockets.asd;h=fd251d6ee5710cda4e53f334208b474ab15552cc;hb=c3699db2053ff3b5ac6a98d4431c3789496002d8;hp=87361fb31be3710102824274150978a46b69fcba;hpb=c082e230ab4ac57f733405a7acb8c168e05c47d1;p=sbcl.git

diff --git a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
index 87361fb..fd251d6 100644
--- a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
+++ b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
@@ -30,11 +30,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)
@@ -51,9 +52,10 @@
 (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)))
@@ -70,6 +72,8 @@
 (defsystem sb-bsd-sockets
     :version "0.58"
     :depends-on (sb-grovel)
+    #+sb-building-contrib :pathname
+    #+sb-building-contrib "SYS:CONTRIB;SB-BSD-SOCKETS;"
     :components ((:file "defpackage")
 		 (:file "split" :depends-on ("defpackage"))
                  (:file "array-data" :depends-on ("defpackage"))
@@ -80,7 +84,7 @@
 		 (:file "foreign-glue" :depends-on ("defpackage" "malloc"))
 		 (sb-grovel:grovel-constants-file
 		  "constants"
-		  :package :sockint  :pathname "constants.lisp"
+		  :package :sockint
 		  :depends-on  ("def-to-lisp" "defpackage" "foreign-glue"))
 		 (:file "sockets"
 			:depends-on ("constants" "array-data"))
@@ -108,7 +112,7 @@
   (operate 'test-op 'sb-bsd-sockets-tests))
 
 (defsystem sb-bsd-sockets-tests
-  :depends-on (sb-rt sb-bsd-sockets)
+  :depends-on (sb-rt sb-bsd-sockets sb-posix)
   :components ((:file "tests")))
 
 (defmethod perform ((o test-op) (c (eql (find-system :sb-bsd-sockets-tests))))