rpms/sbcl/FC-4 .cvsignore, 1.4, 1.5 sbcl-0.9.5-make-config-fix.patch, 1.3, 1.4 sbcl-0.9.5-stdlib_h.patch, 1.1, 1.2 sbcl.spec, 1.25, 1.26 sources, 1.4, 1.5
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Oct 27 17:34:35 UTC 2005
- Previous message (by thread): rpms/sbcl/FC-3 .cvsignore, 1.4, 1.5 sbcl-0.9.5-make-config-fix.patch, 1.1, 1.2 sbcl-0.9.5-stdlib_h.patch, 1.1, 1.2 sbcl-0.9.5-verbose-build.patch, 1.1, 1.2 sbcl.spec, 1.19, 1.20 sources, 1.4, 1.5
- Next message (by thread): rpms/sbcl/devel sbcl.spec,1.27,1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28332/FC-4
Modified Files:
.cvsignore sbcl-0.9.5-make-config-fix.patch
sbcl-0.9.5-stdlib_h.patch sbcl.spec sources
Log Message:
* Thu Oct 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.6-2
- CFLAGS += -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- (re)add/use stdlib_h patch (ppc)
- disable verbose build.log
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 29 Sep 2005 12:43:06 -0000 1.4
+++ .cvsignore 27 Oct 2005 17:34:33 -0000 1.5
@@ -1,4 +1,5 @@
-sbcl-0.9.5-source.tar.bz2
sbcl-0.8.15-powerpc-linux-binary.tar.bz2
sbcl-0.9.4-x86-64-linux-binary.tar.bz2
+sbcl-0.9.5-source.tar.bz2
sbcl-0.9.5-x86-linux-binary.tar.bz2
+sbcl-0.9.6-source.tar.bz2
sbcl-0.9.5-make-config-fix.patch:
Index: sbcl-0.9.5-make-config-fix.patch
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.5-make-config-fix.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sbcl-0.9.5-make-config-fix.patch 29 Sep 2005 20:03:43 -0000 1.3
+++ sbcl-0.9.5-make-config-fix.patch 27 Oct 2005 17:34:33 -0000 1.4
@@ -1,5 +1,5 @@
--- sbcl-0.9.5/make-config.sh.make-config-fix 2005-09-21 10:00:33.000000000 -0500
-+++ sbcl-0.9.5/make-config.sh 2005-09-28 11:42:29.135788304 -0500
++++ sbcl-0.9.5/make-config.sh 2005-09-29 14:58:25.266788248 -0500
@@ -208,7 +208,7 @@
# cross-compilers!
#
@@ -16,7 +16,7 @@
- $GNUMAKE -C tools-for-build where-is-mcontext -I src/runtime
- tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h
+ $GNUMAKE -C tools-for-build where-is-mcontext -I ../src/runtime
-+ tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext, using backup copy"; cp src/runtime/ppc-linux-mcontext.h.BAK src/runtime/ppc-linux-mcontext.h
++ tools-for-build/where-is-mcontext > src/runtime/ppc-linux-mcontext.h || echo "error running where-is-mcontext, using backup copy"; cat src/runtime/ppc-linux-mcontext.h; cat /usr/include/sys/ucontext.h ; cp src/runtime/ppc-linux-mcontext.h.BAK src/runtime/ppc-linux-mcontext.h ||:
elif [ "$sbcl_arch" = "ppc" -a "$sbcl_os" = "darwin" ]; then
printf ' :stack-allocatable-closures' >> $ltf
# We provide a dlopen shim, so a little lie won't hurt
sbcl-0.9.5-stdlib_h.patch:
Index: sbcl-0.9.5-stdlib_h.patch
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl-0.9.5-stdlib_h.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sbcl-0.9.5-stdlib_h.patch 28 Sep 2005 15:59:00 -0000 1.1
+++ sbcl-0.9.5-stdlib_h.patch 27 Oct 2005 17:34:33 -0000 1.2
@@ -1,5 +1,5 @@
--- sbcl-0.9.5/tools-for-build/where-is-mcontext.c.stdlib_h 2005-07-14 15:24:19.000000000 -0500
-+++ sbcl-0.9.5/tools-for-build/where-is-mcontext.c 2005-09-28 10:36:32.090350648 -0500
++++ sbcl-0.9.5/tools-for-build/where-is-mcontext.c 2005-09-29 14:27:25.840464016 -0500
@@ -20,6 +20,7 @@
#include <stdio.h>
@@ -8,3 +8,11 @@
#include <sys/ucontext.h>
int main (int argc, char *argv[]) {
+@@ -45,5 +46,7 @@
+ }
+ printf("\
+ #endif /* PPC_LINUX_MCONTEXT_H */\n");
++
++ exit(0);
+ }
+
Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sbcl.spec 29 Sep 2005 20:10:09 -0000 1.25
+++ sbcl.spec 27 Oct 2005 17:34:33 -0000 1.26
@@ -2,20 +2,22 @@
# build only a minimal sbcl whose sole-purpose is to be bootstrap
# for a future sbcl build
-%define min_bootstrap 1
+#define min_bootstrap 1
+
+# define to enable verbose build for debugging
+#define verbose 1
Name: sbcl
Summary: Steel Bank Common Lisp
-Version: 0.9.5
-Release: 16%{?dist}.1
+Version: 0.9.6
+Release: 2%{?dist}
License: BSD/MIT
Group: Development/Languages
URL: http://sbcl.sourceforge.net/
Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: ppc
-#ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: %{ix86} x86_64
# Pre-generated html docs (not used)
#Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
@@ -49,6 +51,7 @@
%define sbcl_bootstrap_src -a 30
BuildRequires: setarch
%define setarch setarch %{_target_cpu}
+%define min_bootstrap 1
%endif
Source100: my_setarch.c
@@ -89,7 +92,7 @@
%patch3 -p1 -b .optflags
%patch4 -p1 -b .LIB_DIR
%patch5 -p1 -b .make-config-fix
-%patch6 -p1 -b .verbose-build
+%{?verbose:%patch6 -p1 -b .verbose-build}
%patch7 -p1 -b .stdlib_h
# Enable sb-thread
@@ -106,8 +109,7 @@
%if "%{?sbcl_bootstrap_src}" != "%{nil}"
mkdir sbcl-bootstrap
pushd sbcl-*-linux
-chmod +x install.sh
-INSTALL_ROOT=`pwd`/../sbcl-bootstrap ./install.sh
+INSTALL_ROOT=`pwd`/../sbcl-bootstrap sh %{?verbose:-x} ./install.sh
popd
%endif
@@ -117,22 +119,23 @@
%build
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+
# setup local bootstrap
%if "%{?sbcl_bootstrap_src}" != "%{nil}"
export SBCL_HOME=`pwd`/sbcl-bootstrap/lib/sbcl
export PATH=`pwd`/sbcl-bootstrap/bin:${PATH}
%endif
-# my_setarch, to set personality, (about) the same as setarch -R,
-# but usable on fc3 too
-%{__cc} -o my_setarch %{optflags} %{SOURCE100}
-%define my_setarch ./my_setarch
+# my_setarch, to set personality, (about) the same as setarch -R, but usable on fc3 too
+#%{__cc} -o my_setarch %{optflags} %{SOURCE100}
+#define my_setarch ./my_setarch
# trick contrib/ modules to use optflags too
-export EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+export EXTRA_CFLAGS="$CFLAGS"
export DEFAULT_SBCL_HOME=%{_libdir}/sbcl
%{?sbcl_arch:export SBCL_ARCH=%{sbcl_arch}}
-%{?setarch} %{?my_setarch} sh -x ./make.sh %{?bootstrap}
+%{?setarch} %{?my_setarch} sh %{?verbose:-x} ./make.sh %{?bootstrap}
# docs
%if "%{?min_bootstrap}" == "%{nil}"
@@ -140,14 +143,18 @@
%endif
-%check || :
+%check
+# santity check, did sb-posix get built/included?
+# http://bugzilla.redhat.com/bugzilla/169506
+SB_POSIX=%{_libdir}/sbcl/sb-posix
+if [ ! -d $RPM_BUILD_ROOT${SB_POSIX} ]; then
+ echo "%SB_POSIX awol!"
+ exit 1
+fi
pushd tests
# Only x86 builds are expected to pass all
-%ifarch %{ix86} x86_64
-%{?setarch} sh ./run-tests.sh ||:
-%else
+# Don't worry about thread.impure failure(s), threading is optional anyway.
%{?setarch} sh ./run-tests.sh ||:
-%endif
popd
@@ -159,7 +166,7 @@
unset SBCL_HOME
export INSTALL_ROOT=$RPM_BUILD_ROOT%{_prefix}
export LIB_DIR=$RPM_BUILD_ROOT%{_libdir}
-sh -x ./install.sh
+sh %{?verbose:-x} ./install.sh
## Unpackaged files
rm -rf $RPM_BUILD_ROOT%{_docdir}/sbcl
@@ -167,7 +174,7 @@
# CVS crud
find $RPM_BUILD_ROOT -name CVS -type d | xargs rm -rf
find $RPM_BUILD_ROOT -name .cvsignore | xargs rm -f
-# 'test-passed' files from make check (leave these in, for now -- Rex)
+# 'test-passed' files from %%check (leave these in, for now -- Rex)
# find $RPM_BUILD_ROOT -name 'test-passed' | xargs rm -f
@@ -183,7 +190,7 @@
fi
%else
%pre
-# We *could* check for only-on-upgrade, but why bother? (-:
+# min_bootstrap: We *could* check for only-on-upgrade, but why bother? (-:
/sbin/install-info --delete %{_infodir}/sbcl.info %{_infodir}/dir >& /dev/null ||:
/sbin/install-info --delete %{_infodir}/asdf.info %{_infodir}/dir >& /dev/null ||:
%endif
@@ -208,8 +215,14 @@
%changelog
-* Thu Sep 29 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-16
-- more ppc work
+* Thu Oct 27 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.6-2
+- CFLAGS += -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+- (re)add/use stdlib_h patch (ppc)
+- disable verbose build.log
+
+* Wed Oct 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.6-1
+- 0.9.6
+- %%check: verify presence of sb-posix
* Thu Sep 29 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.5-15
- enable sb-thread
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 29 Sep 2005 12:43:06 -0000 1.4
+++ sources 27 Oct 2005 17:34:33 -0000 1.5
@@ -1,4 +1,4 @@
-f594f18813c08f262a6df9a36288adcb sbcl-0.9.5-source.tar.bz2
3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2
67ec41e624a3f2ad7f6f3cde1bd001d3 sbcl-0.9.4-x86-64-linux-binary.tar.bz2
cb01b462b517889723eeaf63b5474c70 sbcl-0.9.5-x86-linux-binary.tar.bz2
+5e94122e73bc59c1411ff93fee948bfb sbcl-0.9.6-source.tar.bz2
- Previous message (by thread): rpms/sbcl/FC-3 .cvsignore, 1.4, 1.5 sbcl-0.9.5-make-config-fix.patch, 1.1, 1.2 sbcl-0.9.5-stdlib_h.patch, 1.1, 1.2 sbcl-0.9.5-verbose-build.patch, 1.1, 1.2 sbcl.spec, 1.19, 1.20 sources, 1.4, 1.5
- Next message (by thread): rpms/sbcl/devel sbcl.spec,1.27,1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list