Update to latest mercurial snapshot.

This commit is contained in:
Jerry James 2017-01-28 12:10:39 -07:00
commit ff7789143d
6 changed files with 39 additions and 35 deletions

1
.gitignore vendored
View file

@ -1,2 +1,3 @@
/clisp-2.49-20130208hg.tar.bz2
/clisp-2.49-20161111hg.tar.xz
/clisp-2.49-20161113hg.tar.xz

View file

@ -1,5 +1,5 @@
--- src/ariarm.d.orig 2016-11-11 08:56:50.449685288 -0700
+++ src/ariarm.d 2016-11-11 09:04:26.686805266 -0700
--- src/ariarm.d.orig 2017-01-28 11:49:37.957965080 -0700
+++ src/ariarm.d 2017-01-28 11:54:14.913643784 -0700
@@ -86,7 +86,7 @@ pc .req r15
#define C(x) x
@ -854,9 +854,9 @@
#endif
END
--- src/makemake.in.orig 2016-11-11 08:56:50.424687309 -0700
+++ src/makemake.in 2016-11-11 09:04:26.688805105 -0700
@@ -1677,7 +1677,7 @@ if [ "$cpu" = hppa ] ; then
--- src/makemake.in.orig 2017-01-28 11:49:37.905965491 -0700
+++ src/makemake.in 2017-01-28 11:54:14.914643775 -0700
@@ -1602,7 +1602,7 @@ if [ "$cpu" = hppa ] ; then
ARI_ASMD=$ARI_ASMD' arihppa'
ARI_ASMS=$ARI_ASMS' arihppa'
fi

View file

@ -1,5 +1,16 @@
--- modules/berkeley-db/configure.in.orig 2016-11-11 08:56:50.543677690 -0700
+++ modules/berkeley-db/configure.in 2016-11-11 09:07:47.419640845 -0700
--- modules/berkeley-db/configure.orig 2017-01-28 11:49:37.845965965 -0700
+++ modules/berkeley-db/configure 2017-01-28 11:54:31.794501872 -0700
@@ -5214,7 +5214,7 @@ if ${ac_cv_dbe_set_errcall_accept_dbe+:}
else
CFLAGS_save="$CFLAGS"
-CFLAGS="$CFLAGS -Werror"
+CFLAGS="$CFLAGS -Wno-uninitialized -Werror"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <db.h>
--- modules/berkeley-db/configure.in.orig 2017-01-28 11:49:37.847965949 -0700
+++ modules/berkeley-db/configure.in 2017-01-28 11:54:31.792501889 -0700
@@ -48,7 +48,7 @@ dnl <http://www.sleepycat.com/docs/ref/u
AC_CACHE_CHECK([whether DB_ENV->set_errcall() accepts DBE],
ac_cv_dbe_set_errcall_accept_dbe,[
@ -9,14 +20,3 @@
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <db.h>
void my_callback (const DB_ENV* dbe, const char *errpfx, const char *msg) {}],
[[DB_ENV dbe; dbe.set_errcall(&dbe,&my_callback);]])],
--- modules/berkeley-db/configure.orig 2016-11-11 08:56:50.543677690 -0700
+++ modules/berkeley-db/configure 2016-11-11 09:07:47.422640603 -0700
@@ -5055,7 +5055,7 @@ if test "${ac_cv_dbe_set_errcall_accept_
else
CFLAGS_save="$CFLAGS"
-CFLAGS="$CFLAGS -Werror"
+CFLAGS="$CFLAGS -Wno-uninitialized -Werror"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <db.h>

View file

@ -1,5 +1,5 @@
--- src/errunix.d.orig 2016-11-11 08:56:50.620671466 -0700
+++ src/errunix.d 2016-11-11 08:59:22.737375082 -0700
--- src/errunix.d.orig 2017-01-28 11:49:37.885965649 -0700
+++ src/errunix.d 2017-01-28 11:53:49.848854498 -0700
@@ -94,7 +94,7 @@ global _Noreturn void OS_error_arg (obje
> FILE: Filename (with quotation marks) as constant ASCIZ-String
> LINE: line number */
@ -9,9 +9,9 @@
var object code = ANSIC_error_code_converter(errorcode);
if (symbolp(code)) { /* known name? */
fputs(" (",stderr);
--- src/lispbibl.d.orig 2016-11-11 08:56:50.378691027 -0700
+++ src/lispbibl.d 2016-11-11 09:03:14.631629862 -0700
@@ -1092,7 +1092,7 @@
--- src/lispbibl.d.orig 2017-01-28 11:49:38.039964433 -0700
+++ src/lispbibl.d 2017-01-28 11:53:49.864854363 -0700
@@ -1012,7 +1012,7 @@
#endif
typedef unsigned char UBYTE;
#else
@ -20,7 +20,7 @@
#endif
#if (short_bitsize==16)
typedef short SWORD;
@@ -1103,26 +1103,36 @@
@@ -1023,26 +1023,36 @@
#if (long_bitsize==32)
typedef long SLONG;
typedef unsigned long ULONG;
@ -57,7 +57,7 @@
#else /* useless type */
#undef HAVE_LONG_LONG_INT
#endif
@@ -1752,10 +1762,14 @@ typedef unsigned_int_with_n_bits(intBWLs
@@ -1684,10 +1694,14 @@ typedef unsigned_int_with_n_bits(intBWLs
#if (intCsize==intWsize)
#define dotimesC dotimesW
#define dotimespC dotimespW
@ -72,8 +72,8 @@
#endif
/* Use 'uintC' for counters, which are small most of the time. */
%% export_def(uintC);
--- src/spvw_debug.d.orig 2016-11-11 08:56:50.407688683 -0700
+++ src/spvw_debug.d 2016-11-11 08:59:22.743374597 -0700
--- src/spvw_debug.d.orig 2017-01-28 11:49:37.970964978 -0700
+++ src/spvw_debug.d 2017-01-28 11:53:49.866854346 -0700
@@ -81,7 +81,7 @@ local void nobject_out1 (FILE* out, obje
fputc('"',out);
} else if (charp(obj)) {
@ -132,8 +132,8 @@
STACK_item_count(top_of_back_trace_frame(bt),
top_of_back_trace_frame(bt->bt_next)),
(((long)((char*)(bt->bt_next) - (char*)bt) ^ SPoffset) - SPoffset)
--- src/spvw_memfile.d.orig 2016-11-11 08:56:50.426687147 -0700
+++ src/spvw_memfile.d 2016-11-11 08:59:22.753373789 -0700
--- src/spvw_memfile.d.orig 2017-01-28 11:49:38.051964338 -0700
+++ src/spvw_memfile.d 2017-01-28 11:53:49.867854338 -0700
@@ -1817,7 +1817,7 @@ local void loadmem_from_handle (Handle h
(uintL)posfixnum_to_V(header._dumptime.seconds));
#endif

View file

@ -1,18 +1,18 @@
# Mercurial snapshot
%global hgver 20161111hg
%global hgver 20161113hg
Name: clisp
Summary: ANSI Common Lisp implementation
Version: 2.49
Release: 20.%{hgver}%{?dist}
Release: 21.%{hgver}%{?dist}
License: GPLv2
URL: http://www.clisp.org/
# The source for this package was pulled from upstream's mercurial repository.
# Use the following commands to generate the tarball:
# hg clone -u 7f50c9d7b9ac http://hg.code.sf.net/p/clisp/clisp clisp-2.49
# hg clone -u 536a48a91754 http://hg.code.sf.net/p/clisp/clisp clisp-2.49
# rm -fr clisp-2.49/.hg*
# tar cvJf clisp-2.49-20161111hg.tar.xz clisp-2.49
# tar cvJf clisp-2.49-20161113hg.tar.xz clisp-2.49
Source0: %{name}-%{version}-%{hgver}.tar.xz
#Source0: http://downloads.sourceforge.net/clisp/%%{name}-%%{version}.tar.bz2
# http://sourceforge.net/tracker/?func=detail&aid=3529607&group_id=1355&atid=301355
@ -34,7 +34,7 @@ BuildRequires: ffcall
BuildRequires: gcc
BuildRequires: gdbm-devel
BuildRequires: gettext-devel
BuildRequires: ghostscript
BuildRequires: ghostscript-core
BuildRequires: groff
BuildRequires: gtk2-devel
BuildRequires: libXaw-devel
@ -413,6 +413,9 @@ ln -s ../../src/modules.c build/full/modules.c
%changelog
* Sat Jan 28 2017 Jerry James <loganjerry@gmail.com> - 2.49-21.20161113hg
- Update to latest mercurial snapshot
* Fri Nov 11 2016 Jerry James <loganjerry@gmail.com> - 2.49-20.20161111hg
- Update to latest mercurial snapshot (bz 1392563)
- Drop upstreamed -gcc5 patch

View file

@ -1 +1 @@
dc44f8738da4a410ed84f9b04440d901 clisp-2.49-20161111hg.tar.xz
SHA512 (clisp-2.49-20161113hg.tar.xz) = 6231289ba0b40292a84ec3d238dda04dfaff5c171aa14ef9f1e2cefc72e02a0cf77f9de98d09b1eb5151d6e1ee4535cb050ff2e6bbcade0492ad211ed2756305