rpms/sbcl/devel sbcl-1.0.30-optflags.patch, NONE, 1.1 sbcl.spec, 1.110, 1.111 sbcl-1.0.28-optflags.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Tue Aug 18 21:05:54 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/sbcl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26204
Modified Files:
sbcl.spec
Added Files:
sbcl-1.0.30-optflags.patch
Removed Files:
sbcl-1.0.28-optflags.patch
Log Message:
* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.30-2
- customize version.lisp-expr for rpm %release
- s|%_libdir|%_prefix/lib|, so common-lisp-controller has at least
a chance to work
sbcl-1.0.30-optflags.patch:
contrib/asdf-module.mk | 2 ++
src/runtime/Config.ppc-linux | 5 +++--
src/runtime/Config.sparc-linux | 1 +
src/runtime/Config.x86-linux | 2 ++
src/runtime/Config.x86_64-linux | 2 +-
5 files changed, 9 insertions(+), 3 deletions(-)
--- NEW FILE sbcl-1.0.30-optflags.patch ---
diff -up sbcl-1.0.30/contrib/asdf-module.mk.optflags sbcl-1.0.30/contrib/asdf-module.mk
--- sbcl-1.0.30/contrib/asdf-module.mk.optflags 2009-04-28 11:02:13.000000000 -0500
+++ sbcl-1.0.30/contrib/asdf-module.mk 2009-08-02 09:37:51.185577992 -0500
@@ -20,6 +20,8 @@ ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME
CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC))))
endif
+EXTRA_CFLAGS += $(RPM_OPT_FLAGS)
+
export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
all: $(EXTRA_ALL_TARGETS)
diff -up sbcl-1.0.30/src/runtime/Config.ppc-linux.optflags sbcl-1.0.30/src/runtime/Config.ppc-linux
--- sbcl-1.0.30/src/runtime/Config.ppc-linux.optflags 2006-11-19 05:26:16.000000000 -0600
+++ sbcl-1.0.30/src/runtime/Config.ppc-linux 2009-08-03 14:22:26.131354239 -0500
@@ -9,8 +9,9 @@
# provided with absolutely no warranty. See the COPYING and CREDITS
# files for more information.
-CFLAGS = -g
-LINKFLAGS += -v -rdynamic
+CFLAGS += $(RPM_OPT_FLAGS)
+LINKFLAGS += -v -rdynamic -Wl,--relax
+ASFLAGS += -Wa,--longcalls
NM = ./linux-nm
ASSEM_SRC = ppc-assem.S ldso-stubs.S
diff -up sbcl-1.0.30/src/runtime/Config.sparc-linux.optflags sbcl-1.0.30/src/runtime/Config.sparc-linux
--- sbcl-1.0.30/src/runtime/Config.sparc-linux.optflags 2005-09-16 08:26:39.000000000 -0500
+++ sbcl-1.0.30/src/runtime/Config.sparc-linux 2009-08-02 09:37:51.186577770 -0500
@@ -10,6 +10,7 @@
# files for more information.
ASFLAGS = -g -Wall
+CFLAGS += $(RPM_OPT_FLAGS)
LINKFLAGS += -v -rdynamic
NM = ./linux-nm
diff -up sbcl-1.0.30/src/runtime/Config.x86_64-linux.optflags sbcl-1.0.30/src/runtime/Config.x86_64-linux
--- sbcl-1.0.30/src/runtime/Config.x86_64-linux.optflags 2006-11-13 10:03:31.000000000 -0600
+++ sbcl-1.0.30/src/runtime/Config.x86_64-linux 2009-08-02 09:37:51.186577770 -0500
@@ -34,7 +34,7 @@ ifdef LISP_FEATURE_SB_THREAD
OS_LIBS += -lpthread
endif
-CFLAGS += -fno-omit-frame-pointer
+CFLAGS += -fno-omit-frame-pointer $(RPM_OPT_FLAGS)
GC_SRC = gencgc.c
diff -up sbcl-1.0.30/src/runtime/Config.x86-linux.optflags sbcl-1.0.30/src/runtime/Config.x86-linux
--- sbcl-1.0.30/src/runtime/Config.x86-linux.optflags 2006-11-13 10:03:31.000000000 -0600
+++ sbcl-1.0.30/src/runtime/Config.x86-linux 2009-08-02 09:37:51.187577619 -0500
@@ -38,6 +38,8 @@ ifdef LISP_FEATURE_SB_THREAD
OS_LIBS += -lpthread
endif
+CFLAGS += $(RPM_OPT_FLAGS)
+
GC_SRC = gencgc.c
# Nothing to do for after-grovel-headers.
Index: sbcl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -p -r1.110 -r1.111
--- sbcl.spec 28 Jul 2009 16:55:35 -0000 1.110
+++ sbcl.spec 18 Aug 2009 21:05:54 -0000 1.111
@@ -8,12 +8,15 @@
%define sbcl_shell /bin/bash
# threading support
+## Enable sb-thread
+%ifarch %{ix86} x86_64
%{?!_without_threads:%global _with_threads --with-threads}
+%endif
Name: sbcl
Summary: Steel Bank Common Lisp
Version: 1.0.30
-Release: 1%{?dist}
+Release: 2%{?dist}
License: BSD
Group: Development/Languages
@@ -28,7 +31,7 @@ ExclusiveArch: %{ix86} x86_64 ppc sparcv
%endif
# Pre-generated html docs (not used)
-#Source1: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
+#Source1: http://downloads.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-documentation-html.tar.bz2
Source2: customize-target-features.lisp
## x86 section
@@ -83,7 +86,7 @@ Source202: sbcl-install-clc.lisp
Patch1: sbcl-1.0.25-default_sbcl_home.patch
Patch2: sbcl-0.9.5-personality.patch
-Patch3: sbcl-1.0.28-optflags.patch
+Patch3: sbcl-1.0.30-optflags.patch
Patch4: sbcl-0.9.17-LIB_DIR.patch
Patch6: sbcl-0.9.5-verbose-build.patch
# Allow override of contrib test failure(s)
@@ -105,14 +108,14 @@ interpreter, and debugger.
%prep
-%setup -q %{?sbcl_bootstrap_src}
+%setup -q %{?sbcl_bootstrap_src}
# Handle pre-generated docs
if [ -d %{name}-%{version}/doc/manual ]; then
mv %{name}-%{version}/doc/manual/* doc/manual/
fi
-#sed -i -e "s|/usr/local/lib/sbcl/|%{_libdir}/sbcl/|" src/runtime/runtime.c
+#sed -i -e "s|/usr/local/lib/sbcl/|%{_prefix}/lib/sbcl/|" src/runtime/runtime.c
#or patch to use SBCL_HOME env var
%patch1 -p1 -b .default_sbcl_home
%patch2 -p1 -b .personality
@@ -123,12 +126,10 @@ fi
%if 0%{?_with_threads:1}
## Enable sb-thread
-%ifarch %{ix86} x86_64
#sed -i -e "s|; :sb-thread|:sb-thread|" base-target-features.lisp-expr
# or
install -m644 -p %{SOURCE2} ./customize-target-features.lisp
%endif
-%endif
# "install" local bootstrap
%if "x%{?sbcl_bootstrap_src}" != "x%{nil}"
@@ -141,6 +142,9 @@ popd
# fix permissions (some have eXecute bit set)
find . -name '*.c' | xargs chmod 644
+# set version.lisp-expr
+sed -i.rpmver -e "s|\"%{version}\"|\"%{version}-%{release}\"|" version.lisp-expr
+
%build
@@ -161,7 +165,13 @@ export PATH=`pwd`/sbcl-bootstrap/bin:${P
# http://bugzilla.redhat.com/214568
#touch contrib/sb-bsd-sockets/test-passed
-export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
+# WORKAROUND ppc linker issue
+%ifarch ppc
+#export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall";
+#echo "RPM_OPT_FLAGS: $RPM_OPT_FLAGS"
+%endif
+
+export DEFAULT_SBCL_HOME=%{_prefix}/lib/sbcl
%{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
%{?setarch} %{?my_setarch} %{?sbcl_shell} ./make.sh %{?bootstrap}
@@ -174,7 +184,7 @@ ERROR=0
# santity check, essential contrib modules get built/included?
CONTRIBS="sb-posix sb-bsd-sockets"
for CONTRIB in $CONTRIBS ; do
- if [ ! -d %{buildroot}%{_libdir}/sbcl/$CONTRIB ]; then
+ if [ ! -d %{buildroot}%{_prefix}/lib/sbcl/$CONTRIB ]; then
echo "WARNING: ${CONTRIB} awol!"
ERROR=1
echo "ulimit -a"
@@ -193,19 +203,19 @@ exit $ERROR
%install
rm -rf %{buildroot}
-mkdir -p %{buildroot}{%{_bindir},%{_libdir},%{_mandir}}
+mkdir -p %{buildroot}{%{_bindir},%{_prefix}/lib,%{_mandir}}
unset SBCL_HOME
export INSTALL_ROOT=%{buildroot}%{_prefix}
-export LIB_DIR=%{buildroot}%{_libdir}
+export LIB_DIR=%{buildroot}%{_prefix}/lib
%{?sbcl_shell} ./install.sh
%if 0%{?common_lisp_controller}
-install -m744 -p -D %{SOURCE200} %{buildroot}%{_libdir}/common-lisp/bin/sbcl.sh
+install -m744 -p -D %{SOURCE200} %{buildroot}%{_prefix}/lib/common-lisp/bin/sbcl.sh
install -m644 -p -D %{SOURCE201} %{buildroot}%{_sysconfdir}/sbcl.rc
-install -m644 -p -D %{SOURCE202} %{buildroot}%{_libdir}/sbcl/install-clc.lisp
+install -m644 -p -D %{SOURCE202} %{buildroot}%{_prefix}/lib/sbcl/install-clc.lisp
# linking ok? -- Rex
-cp -p %{buildroot}%{_libdir}/sbcl/sbcl.core %{buildroot}%{_libdir}/sbcl/sbcl-dist.core
+cp -p %{buildroot}%{_prefix}/lib/sbcl/sbcl.core %{buildroot}%{_prefix}/lib/sbcl/sbcl-dist.core
%endif
## Unpackaged files
@@ -218,6 +228,7 @@ find %{buildroot} -name .cvsignore | xar
find %{buildroot} -name 'test-passed' | xargs rm -vf
+## FIXME! register-common-lisp-implementation fails (at least on x86_64)
%post
/sbin/install-info %{_infodir}/sbcl.info %{_infodir}/dir ||:
/sbin/install-info %{_infodir}/asdf.info %{_infodir}/dir ||:
@@ -236,13 +247,13 @@ fi
%doc BUGS COPYING README CREDITS NEWS TLA TODO
%doc STYLE PRINCIPLES
%{_bindir}/*
-%{_libdir}/sbcl/
+%{_prefix}/lib/sbcl/
%{_mandir}/man?/*
%doc doc/manual/sbcl
%doc doc/manual/asdf
%{_infodir}/*
%if 0%{?common_lisp_controller}
-%{_libdir}/common-lisp/bin/*
+%{_prefix}/lib/common-lisp/bin/*
%{_sysconfdir}/*
%endif
@@ -252,6 +263,11 @@ rm -rf %{buildroot}
%changelog
+* Tue Aug 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.30-2
+- customize version.lisp-expr for rpm %%release
+- s|%%_libdir|%%_prefix/lib|, so common-lisp-controller has at least
+ a chance to work
+
* Tue Jul 28 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.30-1
- sbcl-1.0.30
--- sbcl-1.0.28-optflags.patch DELETED ---
More information about the fedora-extras-commits
mailing list