Accepting request 181095 from home:jengelh:db6
- Add clisp-db6.diff to resolve compile abort with libdb-6.0 OBS-URL: https://build.opensuse.org/request/show/181095 OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/clisp?expand=0&rev=47
This commit is contained in:
Dr. Werner Fink
Git OBS Bridge
parent
7d22210e71
commit
e174156060
48
clisp-db6.diff
Normal file
48
clisp-db6.diff
Normal file
@ -0,0 +1,48 @@
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: 2013-06-14 13:55:00.148814697 +0200
|
||||
|
||||
Work around compile abort with libdb-6.0
|
||||
|
||||
BDB has removed RPC support (which was not implemented anyway;
|
||||
it [set_rpc_server] always returned EOPNOTSUPP even in libdb-4.8).
|
||||
|
||||
---
|
||||
modules/berkeley-db/bdb.c | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: clisp-2.49/modules/berkeley-db/bdb.c
|
||||
===================================================================
|
||||
--- clisp-2.49.orig/modules/berkeley-db/bdb.c
|
||||
+++ clisp-2.49/modules/berkeley-db/bdb.c
|
||||
@@ -64,6 +64,7 @@ static void vecout (unsigned char* v, in
|
||||
this is a macro and not a function for NO_UNICODE */
|
||||
#define asciz_to_string0(a,e) (a ? asciz_to_string(a,e) : NIL)
|
||||
|
||||
+#include <errno.h>
|
||||
#include <db.h>
|
||||
|
||||
/* http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/if.4.4.20.html
|
||||
@@ -358,9 +359,14 @@ DEFUN(BDB:DBE-CREATE,&key PASSWORD ENCRY
|
||||
# elif defined(DB_CLIENT) /* 4.1 and before */
|
||||
SYSCALL(db_env_create,(&dbe,remote_p ? DB_CLIENT : 0));
|
||||
# else
|
||||
-# error how does your Berkeley DB create a remote client?
|
||||
+ SYSCALL(db_env_create,(&dbe,0));
|
||||
# endif
|
||||
+
|
||||
if (remote_p) {
|
||||
+#if !defined(DB_RPCCLIENT) && !defined(DB_CLIENT)
|
||||
+# warning No BDB RPC support
|
||||
+ error_bdb(EOPNOTSUPP, "DBE-CREATE");
|
||||
+#else
|
||||
if (uint_p(STACK_0)) sv_timeout = I_to_uint(STACK_0);
|
||||
if (uint_p(STACK_1)) cl_timeout = I_to_uint(STACK_1);
|
||||
host_restart:
|
||||
@@ -384,6 +390,7 @@ DEFUN(BDB:DBE-CREATE,&key PASSWORD ENCRY
|
||||
STACK_2 = value1;
|
||||
goto host_restart;
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
if (!missingp(STACK_4)) /* :PASSWD */
|
||||
dbe_set_encryption(dbe,&STACK_3,&STACK_4);
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Jun 15 14:27:43 UTC 2013 - jengelh@inai.de
|
||||
|
||||
- Add clisp-db6.diff to resolve compile abort with libdb-6.0
|
||||
- Remove unused %xarch macro; use automirror-selection Source URL
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 14 11:24:33 UTC 2013 - werner@suse.de
|
||||
|
||||
|
||||
78
clisp.spec
78
clisp.spec
@ -20,6 +20,45 @@
|
||||
%define min_suse_ver 1030
|
||||
|
||||
Name: clisp
|
||||
Version: 2.49
|
||||
Release: 0
|
||||
Summary: A Common Lisp Interpreter
|
||||
License: GPL-2.0+
|
||||
Group: Development/Languages/Other
|
||||
Url: http://clisp.cons.org
|
||||
|
||||
Source: http://downloads.sf.net/clisp/%name-%version.tar.bz2
|
||||
Source3: clisp-rpmlintrc
|
||||
Source4: README.SuSE
|
||||
# PATCH-EXTEND-OPENSUSE Set the process execution domain
|
||||
Patch1: clisp-2.49-personality.patch
|
||||
# PATCH-FIX-OPENSUSE Fix crash on Ia64
|
||||
Patch2: clisp-2.39-ia64-wooh.dif
|
||||
# PATCH-EXTEND-OPENSUSE Help (new) CLX to work out of the box
|
||||
Patch3: clisp-2.39-clx.dif
|
||||
# PATCH-EXTEND-OPENSUSE Make sure to be able to use MYCLFAGS
|
||||
Patch4: clisp-2.49-configure.dif
|
||||
# PATCH-FIX-OPENSUSE Make sure to use initialized token on garbage collection
|
||||
Patch5: clisp-2.49-gctoken.dif
|
||||
# PATCH-FEATURE-OPENSUSE Make CLX demos usable at runtime
|
||||
Patch6: clisp-2.49-clx_demos.dif
|
||||
# PATCH-EXTEND-OPENSUSE Enable postgresql SSL feature
|
||||
Patch7: clisp-2.49-postgresql.dif
|
||||
# PATCH-FIX-OPENSUSE Do not use rpath but rpath-link
|
||||
Patch8: clisp-2.49-rpath.dif
|
||||
# PATCH-FIX-OPENSUSE Correct path for header for System V IPC system calls
|
||||
Patch12: clisp-linux.patch
|
||||
# PATCH-FIX-OPENSUSE Glibc got rid of unused __swblk_t type therefore update linux.lisp
|
||||
Patch13: clisp-glibc-fix.patch
|
||||
#PATCH-FIX-UPSTREAM patch#3474660 changeset 15557 4f5985f83127
|
||||
Patch14: clisp-hostname.patch
|
||||
# PATCH-EXTEND-UPSTREAM Make armv7l work
|
||||
Patch15: clisp-arm.patch
|
||||
Patch16: clisp-db6.diff
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%global vimdir %{_datadir}/vim/site/after/syntax
|
||||
ExcludeArch: ppc64 s390x armv4l
|
||||
BuildRequires: db-devel
|
||||
BuildRequires: ffcall
|
||||
BuildRequires: gdbm-devel
|
||||
@ -48,44 +87,6 @@ Requires(pre): vim-data
|
||||
Requires: ffcall
|
||||
Provides: %{name}-devel
|
||||
Suggests: %{name}-doc
|
||||
Version: 2.49
|
||||
Release: 0
|
||||
Summary: A Common Lisp Interpreter
|
||||
License: GPL-2.0+
|
||||
Group: Development/Languages/Other
|
||||
Url: http://clisp.cons.org
|
||||
Source0: http://switch.dl.sourceforge.net/sourceforge/clisp/clisp-2.49.tar.bz2
|
||||
Source3: clisp-rpmlintrc
|
||||
Source4: README.SuSE
|
||||
# PATCH-EXTEND-OPENSUSE Set the process execution domain
|
||||
Patch1: clisp-2.49-personality.patch
|
||||
# PATCH-FIX-OPENSUSE Fix crash on Ia64
|
||||
Patch2: clisp-2.39-ia64-wooh.dif
|
||||
# PATCH-EXTEND-OPENSUSE Help (new) CLX to work out of the box
|
||||
Patch3: clisp-2.39-clx.dif
|
||||
# PATCH-EXTEND-OPENSUSE Make sure to be able to use MYCLFAGS
|
||||
Patch4: clisp-2.49-configure.dif
|
||||
# PATCH-FIX-OPENSUSE Make sure to use initialized token on garbage collection
|
||||
Patch5: clisp-2.49-gctoken.dif
|
||||
# PATCH-FEATURE-OPENSUSE Make CLX demos usable at runtime
|
||||
Patch6: clisp-2.49-clx_demos.dif
|
||||
# PATCH-EXTEND-OPENSUSE Enable postgresql SSL feature
|
||||
Patch7: clisp-2.49-postgresql.dif
|
||||
# PATCH-FIX-OPENSUSE Do not use rpath but rpath-link
|
||||
Patch8: clisp-2.49-rpath.dif
|
||||
# PATCH-FIX-OPENSUSE Correct path for header for System V IPC system calls
|
||||
Patch12: clisp-linux.patch
|
||||
# PATCH-FIX-OPENSUSE Glibc got rid of unused __swblk_t type therefore update linux.lisp
|
||||
Patch13: clisp-glibc-fix.patch
|
||||
#PATCH-FIX-UPSTREAM patch#3474660 changeset 15557 4f5985f83127
|
||||
Patch14: clisp-hostname.patch
|
||||
# PATCH-EXTEND-UPSTREAM Make armv7l work
|
||||
Patch15: clisp-arm.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%global vimdir %{_datadir}/vim/site/after/syntax
|
||||
%global xarch ppc64 s390x armv4l
|
||||
ExcludeArch: ppc64 s390x armv4l
|
||||
|
||||
%description
|
||||
Common Lisp is a high-level, all-purpose programming language. CLISP is
|
||||
@ -138,6 +139,7 @@ contains two nice applications.
|
||||
%endif
|
||||
%patch14 -p0
|
||||
%patch15 -p0
|
||||
%patch -P 16 -p1
|
||||
|
||||
%build
|
||||
#
|
||||
|
||||
Loading…
Reference in New Issue
Block a user