From 4ac6cacd9348b4c568106f82c3a0a4294f49b44e Mon Sep 17 00:00:00 2001 From: Kevin Rosenberg Date: Sun, 21 Sep 2003 01:29:59 +0000 Subject: [PATCH] 0.8.3.83: * Compilation changes for contrib/sb-bsd-sockets for SuSE AMD64 Compilation is now successful on this platform, but two test cases currently fail. --- contrib/sb-bsd-sockets/Makefile | 20 ++++++++++++++++++++ contrib/sb-bsd-sockets/sb-bsd-sockets.asd | 14 ++++++++++---- version.lisp-expr | 2 +- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/contrib/sb-bsd-sockets/Makefile b/contrib/sb-bsd-sockets/Makefile index c1335eb..968253d 100644 --- a/contrib/sb-bsd-sockets/Makefile +++ b/contrib/sb-bsd-sockets/Makefile @@ -1,2 +1,22 @@ +# Set CFLAGS and LDFLAGS for sb-bsd-sockets.asd's invocation of gcc + +UNAME:=$(shell uname -m) + +export CFLAGS=-fPIC +ifeq (solaris,$(UNAME)) + export LDFLAGS=-shared -lresolv -lsocket -lnsl +else + ifeq (Darwin,$(UNAME)) + export LDFLAGS=-bundle + else + ifeq (x86_64,$(UNAME)) + export LDFLAGS=-m32 -shared + export CFLAGS+= -m32 + else + export LDFLAGS=-shared + endif + endif +endif + SYSTEM=sb-bsd-sockets include ../asdf-module.mk diff --git a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd index 9fa49e5..09a1054 100644 --- a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd +++ b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd @@ -29,9 +29,12 @@ (let ((dso-name (unix-name (car (output-files operation dso))))) (unless (zerop (run-shell-command - #+sunos "gcc -shared -lresolv -lsocket -lnsl -o ~S ~{~S ~}" - #+darwin "gcc -bundle -o ~S ~{~S ~}" - #-(or darwin sunos) "gcc -shared -o ~S ~{~S ~} " + "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!") dso-name (mapcar #'unix-name (mapcan (lambda (c) @@ -47,7 +50,10 @@ (component-pathname c)))) (defmethod perform ((op compile-op) (c c-source-file)) (unless - (= 0 (run-shell-command "gcc -fPIC -o ~S -c ~S" + (= 0 (run-shell-command "gcc ~A -o ~S -c ~S" + (if (sb-ext:posix-getenv "CFLAGS") + (sb-ext:posix-getenv "CFLAGS") + "-fPIC!") (unix-name (car (output-files op c))) (unix-name (component-pathname c)))) (error 'operation-error :operation op :component c))) diff --git a/version.lisp-expr b/version.lisp-expr index f2b16ae..af13694 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.3.82" +"0.8.3.83" -- 1.7.10.4