[pvs-sbcl] Adapt to new fixnum size. Fix the (chmod) function.

Jerry James jjames at fedoraproject.org
Fri Jan 20 19:50:59 UTC 2012


commit cfbf2b47945b34fd52b01d10900ab96d5b9ae1c6
Author: Jerry James <loganjerry at gmail.com>
Date:   Fri Jan 20 12:50:36 2012 -0700

    Adapt to new fixnum size.
    Fix the (chmod) function.

 pvs-chmod.patch  |   11 +++++++++++
 pvs-hashfn.patch |   12 ++++++++++++
 pvs-sbcl.spec    |   11 +++++++++++
 3 files changed, 34 insertions(+), 0 deletions(-)
---
diff --git a/pvs-chmod.patch b/pvs-chmod.patch
new file mode 100644
index 0000000..a7576ba
--- /dev/null
+++ b/pvs-chmod.patch
@@ -0,0 +1,11 @@
+--- src/utils.lisp.orig	2011-04-15 11:45:05.000000000 -0600
++++ src/utils.lisp	2012-01-20 12:12:15.770232801 -0700
+@@ -398,7 +398,7 @@
+ #+sbcl
+ (defun chmod (prot file)
+   (sb-ext:run-program
+-   "chmod"
++   "/bin/chmod"
+    (list prot (namestring file))
+    :output nil :error nil :wait nil))
+ 
diff --git a/pvs-hashfn.patch b/pvs-hashfn.patch
new file mode 100644
index 0000000..6f43088
--- /dev/null
+++ b/pvs-hashfn.patch
@@ -0,0 +1,12 @@
+--- src/utils/hashfn.lisp.orig	2011-04-15 11:45:05.000000000 -0600
++++ src/utils/hashfn.lisp	2012-01-20 12:07:51.141297752 -0700
+@@ -76,8 +76,7 @@
+     #+(and allegro (not 64bit)) 24
+     #+(and allegro 64bit) 32
+     #+cmu 29
+-    #+(and sbcl (not x86-64)) 29
+-    #+(and sbcl x86-64) 60))
++    #+sbcl sb-vm:n-positive-fixnum-bits))
+ 
+ (defconstant-if-unbound pvs-sxhash-byte
+   (byte pvs-sxhash-bits 0))
diff --git a/pvs-sbcl.spec b/pvs-sbcl.spec
index 8fa57d6..7d87fbf 100644
--- a/pvs-sbcl.spec
+++ b/pvs-sbcl.spec
@@ -17,6 +17,13 @@ Source5:        pvs-sbcl.desktop
 # library instead of building the included sources, and enables building on
 # architectures that the original sources do not support.
 Patch0:         pvs-fedora.patch
+# This patch was sent upstream 20 Jan 2012.  It adapts to the changed number
+# of bits in a fixnum, starting with SBCL 1.0.53.
+Patch1:         pvs-hashfn.patch
+# This patch was sent upstream 20 Jan 2012.  It fixes a case where a relative
+# path is passed to a function that expects an absolute path, thereby breaking
+# the chmod function 
+Patch2:         pvs-chmod.patch
 
 BuildRequires:  automake
 BuildRequires:  desktop-file-utils
@@ -58,6 +65,8 @@ the lvm2 package.
 %prep
 %setup -q -c
 %patch0
+%patch1
+%patch2
 
 # Upstream didn't give us a configure script
 autoreconf -i
@@ -174,6 +183,8 @@ update-desktop-database %{_datadir}/applications &>/dev/null ||:
 %changelog
 * Wed Jan 18 2012 Jerry James <loganjerry at gmail.com> - 5.0-7
 - rebuild (sbcl)
+- Adapt to new fixnum size
+- Fix the (chmod) function
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild


More information about the scm-commits mailing list