From 3b6f398c70bef36546428a522b3f29ec92b7b729 Mon Sep 17 00:00:00 2001
From: Rex Dieter rdieter@math.unl.edu Date: Thu, 30 Apr 2015 17:50:56 -0500 Subject: 1.2.11
diff --git a/.gitignore b/.gitignore index 9ff31f4..4f99eca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /sbcl-1.2.?-*-linux-binary.tar.bz2 -/sbcl-1.2.8-documentation-html.tar.bz2 -/sbcl-1.2.8-source.tar.bz2 +/sbcl-1.2.11-documentation-html.tar.bz2 +/sbcl-1.2.11-source.tar.bz2 diff --git a/sbcl-1.0.51-generate_version.patch b/sbcl-1.0.51-generate_version.patch deleted file mode 100644 index 9711a5a..0000000 --- a/sbcl-1.0.51-generate_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up sbcl-1.0.51/generate-version.sh.gitfix sbcl-1.0.51/generate-version.sh ---- sbcl-1.0.51/generate-version.sh.gitfix 2011-08-20 18:15:12.000000000 -0500 -+++ sbcl-1.0.51/generate-version.sh 2011-08-22 08:17:12.575478114 -0500 -@@ -2,7 +2,7 @@ - # Not a shell script, but something intended to be sourced from shell scripts - git_available_p() { - # Check that (1) we have git (2) this is a git tree. -- if ( which git >/dev/null 2>/dev/null && git describe >/dev/null 2>/dev/null ) -+ if ( test -d .git && which git >/dev/null 2>/dev/null && git describe >/dev/null 2>/dev/null ) - then - echo "ok" - else diff --git a/sbcl-1.2.11-generate_version.patch b/sbcl-1.2.11-generate_version.patch new file mode 100644 index 0000000..6e6a6ab --- /dev/null +++ b/sbcl-1.2.11-generate_version.patch @@ -0,0 +1,12 @@ +diff -up sbcl-1.2.11/generate-version.sh.generate_version sbcl-1.2.11/generate-version.sh +--- sbcl-1.2.11/generate-version.sh.generate_version 2015-04-30 16:57:05.271114866 -0500 ++++ sbcl-1.2.11/generate-version.sh 2015-04-30 16:58:00.375330676 -0500 +@@ -2,7 +2,7 @@ + + git_available_p() { + # Check that (1) we have git (2) this is a git tree. +- if ( which git >/dev/null 2>/dev/null && git describe >/dev/null 2>/dev/null ) ++ if ( test -d .git && which git >/dev/null 2>/dev/null && git describe >/dev/null 2>/dev/null ) + then + echo "ok" + else diff --git a/sbcl-1.2.11-optflags.patch b/sbcl-1.2.11-optflags.patch new file mode 100644 index 0000000..b931d39 --- /dev/null +++ b/sbcl-1.2.11-optflags.patch @@ -0,0 +1,81 @@ +diff -up sbcl-1.2.11/contrib/asdf-module.mk.optflags sbcl-1.2.11/contrib/asdf-module.mk +--- sbcl-1.2.11/contrib/asdf-module.mk.optflags 2015-04-30 16:55:32.813752766 -0500 ++++ sbcl-1.2.11/contrib/asdf-module.mk 2015-04-30 16:56:19.636936144 -0500 +@@ -24,6 +24,8 @@ ifeq (Linux,$(UNAME)) + EXTRA_CFLAGS=-D_GNU_SOURCE + endif + ++EXTRA_CFLAGS += $(RPM_OPT_FLAGS) ++ + export CC SBCL EXTRA_CFLAGS + + all: $(FASL) $(ASD) +diff -up sbcl-1.2.11/src/runtime/Config.arm-linux.optflags sbcl-1.2.11/src/runtime/Config.arm-linux +--- sbcl-1.2.11/src/runtime/Config.arm-linux.optflags 2015-04-27 09:56:49.000000000 -0500 ++++ sbcl-1.2.11/src/runtime/Config.arm-linux 2015-04-30 16:55:32.813752766 -0500 +@@ -9,7 +9,7 @@ + # provided with absolutely no warranty. See the COPYING and CREDITS + # files for more information. + +-CFLAGS = -g -marm -march=armv5 ++CFLAGS += $(RPM_OPT_FLAGS) + #LINKFLAGS += -v -rdynamic -m32 + NM = ./linux-nm + +diff -up sbcl-1.2.11/src/runtime/Config.ppc-linux.optflags sbcl-1.2.11/src/runtime/Config.ppc-linux +--- sbcl-1.2.11/src/runtime/Config.ppc-linux.optflags 2015-04-27 09:56:49.000000000 -0500 ++++ sbcl-1.2.11/src/runtime/Config.ppc-linux 2015-04-30 16:55:32.814752770 -0500 +@@ -9,7 +9,7 @@ + # provided with absolutely no warranty. See the COPYING and CREDITS + # files for more information. + +-CFLAGS = -g -m32 ++CFLAGS += -g -m32 + LINKFLAGS += -v -rdynamic -m32 + NM = ./linux-nm + +@@ -19,6 +19,8 @@ ARCH_SRC = ppc-arch.c + OS_SRC = linux-os.c ppc-linux-os.c + OS_LIBS = -ldl + ++CFLAGS += $(RPM_OPT_FLAGS) ++ + ifdef LISP_FEATURE_GENCGC + GC_SRC = gencgc.c + else +diff -up sbcl-1.2.11/src/runtime/Config.sparc-linux.optflags sbcl-1.2.11/src/runtime/Config.sparc-linux +--- sbcl-1.2.11/src/runtime/Config.sparc-linux.optflags 2015-04-27 09:56:49.000000000 -0500 ++++ sbcl-1.2.11/src/runtime/Config.sparc-linux 2015-04-30 16:55:32.814752770 -0500 +@@ -28,6 +28,8 @@ else + GC_SRC = cheneygc.c + endif + ++CFLAGS += $(RPM_OPT_FLAGS) ++ + # Nothing to do for after-grovel-headers. + .PHONY: after-grovel-headers + after-grovel-headers: +diff -up sbcl-1.2.11/src/runtime/Config.x86-64-linux.optflags sbcl-1.2.11/src/runtime/Config.x86-64-linux +--- sbcl-1.2.11/src/runtime/Config.x86-64-linux.optflags 2015-04-27 09:56:49.000000000 -0500 ++++ sbcl-1.2.11/src/runtime/Config.x86-64-linux 2015-04-30 16:55:32.814752770 -0500 +@@ -44,6 +44,8 @@ endif + + CFLAGS += -fno-omit-frame-pointer + ++CFLAGS += $(RPM_OPT_FLAGS) ++ + GC_SRC = gencgc.c + + # Hardened GCC enables PIE by default +diff -up sbcl-1.2.11/src/runtime/Config.x86-linux.optflags sbcl-1.2.11/src/runtime/Config.x86-linux +--- sbcl-1.2.11/src/runtime/Config.x86-linux.optflags 2015-04-27 09:56:50.000000000 -0500 ++++ sbcl-1.2.11/src/runtime/Config.x86-linux 2015-04-30 16:55:32.814752770 -0500 +@@ -49,6 +49,8 @@ LINKFLAGS += -nopie + LDFLAGS += -nopie + endif + ++CFLAGS += $(RPM_OPT_FLAGS) ++ + GC_SRC = gencgc.c + + # Nothing to do for after-grovel-headers. diff --git a/sbcl-1.2.8-optflags.patch b/sbcl-1.2.8-optflags.patch deleted file mode 100644 index bc96ceb..0000000 --- a/sbcl-1.2.8-optflags.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -up sbcl-1.2.8/contrib/asdf-module.mk.optflags sbcl-1.2.8/contrib/asdf-module.mk ---- sbcl-1.2.8/contrib/asdf-module.mk.optflags 2015-01-31 08:24:55.000000000 -0600 -+++ sbcl-1.2.8/contrib/asdf-module.mk 2015-02-13 12:53:48.144358286 -0600 -@@ -27,6 +27,8 @@ ifeq (Linux,$(UNAME)) - EXTRA_CFLAGS=-D_GNU_SOURCE - endif - -+EXTRA_CFLAGS += $(RPM_OPT_FLAGS) -+ - export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS - - all: $(FASL) $(ASD) $(EXTRA_ALL_TARGETS) -diff -up sbcl-1.2.8/src/runtime/Config.arm-linux.optflags sbcl-1.2.8/src/runtime/Config.arm-linux ---- sbcl-1.2.8/src/runtime/Config.arm-linux.optflags 2015-01-31 08:24:57.000000000 -0600 -+++ sbcl-1.2.8/src/runtime/Config.arm-linux 2015-02-13 12:53:48.144358286 -0600 -@@ -9,7 +9,7 @@ - # provided with absolutely no warranty. See the COPYING and CREDITS - # files for more information. - --CFLAGS = -g -marm -march=armv5 -+CFLAGS += $(RPM_OPT_FLAGS) - #LINKFLAGS += -v -rdynamic -m32 - NM = ./linux-nm - -diff -up sbcl-1.2.8/src/runtime/Config.ppc-linux.optflags sbcl-1.2.8/src/runtime/Config.ppc-linux ---- sbcl-1.2.8/src/runtime/Config.ppc-linux.optflags 2015-01-31 08:24:57.000000000 -0600 -+++ sbcl-1.2.8/src/runtime/Config.ppc-linux 2015-02-13 12:53:48.144358286 -0600 -@@ -9,7 +9,7 @@ - # provided with absolutely no warranty. See the COPYING and CREDITS - # files for more information. - --CFLAGS = -g -m32 -+CFLAGS += -g -m32 - LINKFLAGS += -v -rdynamic -m32 - NM = ./linux-nm - -@@ -19,6 +19,8 @@ ARCH_SRC = ppc-arch.c - OS_SRC = linux-os.c ppc-linux-os.c - OS_LIBS = -ldl - -+CFLAGS += $(RPM_OPT_FLAGS) -+ - ifdef LISP_FEATURE_GENCGC - GC_SRC = gencgc.c - else -diff -up sbcl-1.2.8/src/runtime/Config.sparc-linux.optflags sbcl-1.2.8/src/runtime/Config.sparc-linux ---- sbcl-1.2.8/src/runtime/Config.sparc-linux.optflags 2015-01-31 08:24:57.000000000 -0600 -+++ sbcl-1.2.8/src/runtime/Config.sparc-linux 2015-02-13 12:53:48.145358308 -0600 -@@ -28,6 +28,8 @@ else - GC_SRC = cheneygc.c - endif - -+CFLAGS += $(RPM_OPT_FLAGS) -+ - # Nothing to do for after-grovel-headers. - .PHONY: after-grovel-headers - after-grovel-headers: -diff -up sbcl-1.2.8/src/runtime/Config.x86-64-linux.optflags sbcl-1.2.8/src/runtime/Config.x86-64-linux ---- sbcl-1.2.8/src/runtime/Config.x86-64-linux.optflags 2015-02-13 12:53:51.220426514 -0600 -+++ sbcl-1.2.8/src/runtime/Config.x86-64-linux 2015-02-13 12:54:35.302379698 -0600 -@@ -44,6 +44,8 @@ endif - - CFLAGS += -fno-omit-frame-pointer - -+CFLAGS += $(RPM_OPT_FLAGS) -+ - GC_SRC = gencgc.c - - # Hardened GCC enables PIE by default -diff -up sbcl-1.2.8/src/runtime/Config.x86-linux.optflags sbcl-1.2.8/src/runtime/Config.x86-linux ---- sbcl-1.2.8/src/runtime/Config.x86-linux.optflags 2015-01-31 08:24:57.000000000 -0600 -+++ sbcl-1.2.8/src/runtime/Config.x86-linux 2015-02-13 12:53:51.220426514 -0600 -@@ -49,6 +49,8 @@ LINKFLAGS += -nopie - LDFLAGS += -nopie - endif - -+CFLAGS += $(RPM_OPT_FLAGS) -+ - GC_SRC = gencgc.c - - # Nothing to do for after-grovel-headers. diff --git a/sbcl.spec b/sbcl.spec index 668c8bb..a32b96f 100644 --- a/sbcl.spec +++ b/sbcl.spec @@ -10,7 +10,7 @@
Name: sbcl Summary: Steel Bank Common Lisp -Version: 1.2.8 +Version: 1.2.11 Release: 1%{?dist}
License: BSD @@ -93,11 +93,11 @@ Source202: sbcl-install-clc.lisp %endif
Patch2: sbcl-1.1.13-personality.patch -Patch3: sbcl-1.2.8-optflags.patch +Patch3: sbcl-1.2.11-optflags.patch Patch6: sbcl-0.9.5-verbose-build.patch
## upstreamable patches -Patch50: sbcl-1.0.51-generate_version.patch +Patch50: sbcl-1.2.11-generate_version.patch
## upstream patches
@@ -120,7 +120,7 @@ interpreter, and debugger.
%prep -%setup -c -n sbcl-%{version} -a 1 %{?sbcl_bootstrap_src} +%setup -q -c -n sbcl-%{version} -a 1 %{?sbcl_bootstrap_src}
pushd sbcl-%{version}
@@ -266,6 +266,9 @@ fi
%changelog +* Thu Apr 30 2015 Rex Dieter rdieter@fedoraproject.org 1.2.11-1 +- 1.2.11 + * Fri Feb 13 2015 Rex Dieter rdieter@fedoraproject.org 1.2.8-1 - 1.2.8
diff --git a/sources b/sources index 2bf8486..613b5cb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -3dc34c657e3be724dfef7c4c069fe383 sbcl-1.2.8-documentation-html.tar.bz2 -bb14259d09651adb8d9d2f892792b295 sbcl-1.2.8-source.tar.bz2 +896dea8eddb004eaa66382c73faf2d3b sbcl-1.2.11-documentation-html.tar.bz2 +ce3d9c18656646ca99773a0ed49ab730 sbcl-1.2.11-source.tar.bz2
scm-commits@lists.fedoraproject.org