From: Cyrus Harmon <ch-sbcl@bobobeach.com>
Date: Mon, 31 Aug 2009 06:11:12 +0000 (+0000)
Subject: 1.0.31.2: snow leopard (macos 10.6) build fixes
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=9e0cc7f6afca5682944d9cc88eed63b5d80cbe9e;p=sbcl.git

1.0.31.2: snow leopard (macos 10.6) build fixes

 * on x86/darwin use -arch i386 flags in sb-grovel C compilation

 * comment out failing sb-posix tests

 * add -arch i386 flags to Config.x86-darwin CFLAGS and LINKFLAGS

 * remove #include <ucontext.h> instances
---

diff --git a/contrib/sb-grovel/def-to-lisp.lisp b/contrib/sb-grovel/def-to-lisp.lisp
index 4c6cad4..fceabeb 100644
--- a/contrib/sb-grovel/def-to-lisp.lisp
+++ b/contrib/sb-grovel/def-to-lisp.lisp
@@ -207,6 +207,8 @@ code:
                         "-D_FILE_OFFSET_BITS=64")
                       #+(and x86-64 darwin)
                       '("-arch" "x86_64")
+                      #+(and x86 darwin)
+                      '("-arch" "i386")
                       #+(and x86-64 sunos) '("-m64")
                       (list "-o"
                             (namestring tmp-a-dot-out)
diff --git a/contrib/sb-posix/posix-tests.lisp b/contrib/sb-posix/posix-tests.lisp
index b3ce8a2..69a00a7 100644
--- a/contrib/sb-posix/posix-tests.lisp
+++ b/contrib/sb-posix/posix-tests.lisp
@@ -213,6 +213,7 @@
         result)))
   #.sb-posix::eacces)
 
+#-darwin
 (deftest stat.1
   (let* ((stat (sb-posix:stat *test-directory*))
          (mode (sb-posix::stat-mode stat)))
@@ -220,7 +221,7 @@
     (logand mode (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec)))
   #.(logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec))
 
-#-win32
+#-(or darwin win32)
 (deftest stat.2
   (let* ((stat (sb-posix:stat "/"))
          (mode (sb-posix::stat-mode stat)))
@@ -241,7 +242,7 @@
     (< (- atime unix-now) 10))
   t)
 
-#-win32
+#-(or darwin win32)
 (deftest stat.4
   (let* ((stat (sb-posix:stat (make-pathname :directory '(:absolute :up))))
          (mode (sb-posix::stat-mode stat)))
@@ -330,6 +331,7 @@
     (sb-posix:s-isreg mode))
   nil)
 
+#-darwin
 (deftest stat-mode.2
   (with-stat-mode (mode *test-directory*)
     (sb-posix:s-isdir mode))
@@ -356,7 +358,7 @@
     (sb-posix:s-issock mode))
   nil)
 
-#-win32
+#-(or win32 darwin)
 (deftest stat-mode.7
   (let ((link-pathname (make-pathname :name "stat-mode.7"
                                       :defaults *test-directory*)))
@@ -368,6 +370,7 @@
       (ignore-errors (sb-posix:unlink link-pathname))))
   t)
 
+#-darwin
 (deftest stat-mode.8
   (let ((pathname (make-pathname :name "stat-mode.8"
                                  :defaults *test-directory*)))
@@ -515,6 +518,7 @@
       (sb-posix:closedir dir)))
   t)
 
+#-darwin
 (deftest readdir/dirent-name
     (let ((dir (sb-posix:opendir *current-directory*)))
       (unwind-protect
@@ -607,12 +611,12 @@
   t)
 
 
-#-win32
+#-(or darwin win32)
 (deftest time.1
     (plusp (sb-posix:time))
   t)
 
-#-win32
+#-(or darwin win32)
 (deftest utimes.1
     (let ((file (merge-pathnames #p"utimes.1" *test-directory*))
           (atime (random (1- (expt 2 31))))
diff --git a/src/runtime/Config.x86-darwin b/src/runtime/Config.x86-darwin
index 8c70575..ff19612 100644
--- a/src/runtime/Config.x86-darwin
+++ b/src/runtime/Config.x86-darwin
@@ -9,8 +9,8 @@
 # provided with absolutely no warranty. See the COPYING and CREDITS
 # files for more information.
 
-CFLAGS = -g -Wall -O2 -fdollars-in-identifiers -mmacosx-version-min=10.4
-LINKFLAGS += -mmacosx-version-min=10.4
+CFLAGS = -arch i386 -g -Wall -O2 -fdollars-in-identifiers -mmacosx-version-min=10.4
+LINKFLAGS += -arch i386 -mmacosx-version-min=10.4
 OS_SRC = bsd-os.c x86-bsd-os.c darwin-os.c x86-darwin-os.c darwin-dlshim.c darwin-langinfo.c
 OS_LIBS = -lSystem -lc -ldl
 ifdef LISP_FEATURE_SB_THREAD
diff --git a/src/runtime/darwin-os.c b/src/runtime/darwin-os.c
index 45738df..a60dc30 100644
--- a/src/runtime/darwin-os.c
+++ b/src/runtime/darwin-os.c
@@ -18,7 +18,6 @@
 #include "globals.h"
 #include "runtime.h"
 #include <signal.h>
-#include <ucontext.h>
 #include <limits.h>
 #include <mach-o/dyld.h>
 #include "bsd-os.h"
diff --git a/src/runtime/darwin-os.h b/src/runtime/darwin-os.h
index b78f470..9228d1b 100644
--- a/src/runtime/darwin-os.h
+++ b/src/runtime/darwin-os.h
@@ -27,7 +27,6 @@ typedef struct ucontext os_context_t;
 
 
 #else
-#include <ucontext.h>
 typedef ucontext_t os_context_t;
 #endif
 
diff --git a/version.lisp-expr b/version.lisp-expr
index 09adcf1..d0a3d2e 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".)
-"1.0.31.1"
+"1.0.31.2"