[packages/clisp] drop patches which don't seem to be necessary anymore
atler
atler at pld-linux.org
Thu May 7 19:02:15 CEST 2020
commit 3a2acc05cc0e4ddb6c3418adde74ca30393e9eac
Author: Jan Palus <atler at pld-linux.org>
Date: Thu May 7 19:01:33 2020 +0200
drop patches which don't seem to be necessary anymore
clisp-alpha.patch | 35 -----------------------------------
clisp-glibc.patch | 37 -------------------------------------
clisp-readline.patch | 15 ---------------
clisp.spec | 17 ++---------------
gcc.patch | 39 ---------------------------------------
x86.patch | 12 ------------
6 files changed, 2 insertions(+), 153 deletions(-)
---
diff --git a/clisp.spec b/clisp.spec
index 623bdce..9716fb6 100644
--- a/clisp.spec
+++ b/clisp.spec
@@ -21,13 +21,7 @@ Group: Development/Languages
Source0: https://gitlab.com/gnu-clisp/clisp/-/archive/clisp-%{version}-%{version_date}/clisp-clisp-%{version}-%{version_date}.tar.bz2
# Source0-md5: 57be9eac0883590760dcc2fc24fc0fd6
Patch0: %{name}-shell.patch
-Patch1: %{name}-alpha.patch
-Patch2: %{name}-glibc.patch
-# https://sourceforge.net/p/clisp/bugs/688/attachment/patch-modules_readline_readline.lisp
-Patch3: %{name}-readline.patch
-Patch4: x32.patch
-Patch5: x86.patch
-Patch6: gcc.patch
+Patch1: x32.patch
URL: http://clisp.cons.org/
BuildRequires: ffcall-devel
BuildRequires: gettext-tools
@@ -90,14 +84,7 @@ software livre, distribuído sob os termos da GNU GPL.
%prep
%setup -q -n clisp-clisp-%{version}-%{version_date}
%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p0
-%patch4 -p1
-%ifarch %{ix86}
-#%patch5 -p1
-%endif
-#%patch6 -p1
+%patch1 -p1
# changing default -O to optflags causes memory fault on amd64
# - so something is broken... code or compiler
diff --git a/clisp-alpha.patch b/clisp-alpha.patch
deleted file mode 100644
index 7a3a7f6..0000000
--- a/clisp-alpha.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- clisp-2.35/src/spvw.d.orig 2005-08-18 18:56:55.000000000 +0200
-+++ clisp-2.35/src/spvw.d 2005-10-10 13:25:37.000000000 +0200
-@@ -2671,6 +2671,10 @@
- # Don't use more than 36 address bits, otherwise mmap() fails.
- part &= 0x0000000FFFFFFFFFUL;
- #endif
-+ #if defined(DECALPHA) && defined(UNIX_LINUX)
-+ # Don't use more than 40 address bits, otherwise mmap() fails.
-+ part &= 0x000000FFFFFFFFFFUL;
-+ #endif
- mem.heaps[0].heap_limit = start + round_down(1*part,map_pagesize);
- mem.heaps[1].heap_limit = start + round_down(4*part,map_pagesize);
- #endif
-@@ -2713,6 +2717,10 @@
- # Don't use more than 36 address bits, otherwise mmap() fails.
- part &= 0x0000000FFFFFFFFFUL;
- #endif
-+ #if defined(DECALPHA) && defined(UNIX_LINUX)
-+ # Don't use more than 40 address bits, otherwise mmap() fails.
-+ part &= 0x000000FFFFFFFFFFUL;
-+ #endif
- mem.heaps[0].heap_limit = start + round_down(1*part,map_pagesize);
- mem.heaps[0].heap_hardlimit =
- mem.heaps[1].heap_limit = start + round_down(2*part,map_pagesize);
---- clisp-2.49/src/lispbibl.d.orig 2012-12-13 18:49:18.149361417 +0100
-+++ clisp-2.49/src/lispbibl.d 2012-12-13 18:56:22.232685912 +0100
-@@ -2979,7 +2979,7 @@
- #endif
-
-
--#if (oint_addr_shift == 0) && (addr_shift == 0) && defined(TYPECODES) && !defined(WIDE_SOFT) && !(defined(AMD64) && defined(UNIX_LINUX))
-+#if (oint_addr_shift == 0) && (addr_shift == 0) && defined(TYPECODES) && !defined(WIDE_SOFT) && !(defined(AMD64) && defined(UNIX_LINUX)) && !(defined(DECALPHA) && defined(UNIX_LINUX))
- /* If the address bits are the lower ones and not WIDE_SOFT,
- memory mapping may be possible. */
-
diff --git a/clisp-glibc.patch b/clisp-glibc.patch
deleted file mode 100644
index 08c88fa..0000000
--- a/clisp-glibc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- clisp-2.49/modules/bindings/glibc/linux.lisp.orig 2008-10-08 18:36:19.000000000 +0200
-+++ clisp-2.49/modules/bindings/glibc/linux.lisp 2017-12-05 15:58:10.508428262 +0100
-@@ -67,7 +67,7 @@
- (def-c-type __daddr_t) ; int
- (def-c-type __caddr_t) ; c-pointer
- (def-c-type __time_t) ; long
--(def-c-type __swblk_t) ; long
-+;;(def-c-type __swblk_t) ; long
-
- (def-c-type __fd_mask ulong)
- (eval-when (load compile eval)
-@@ -86,7 +86,7 @@
-
- (def-c-type __key_t) ; int
-
--(c-lines "#include <bits/ipctypes.h>~%")
-+(c-lines "#include <sys/ipc.h>~%")
- (def-c-type __ipc_pid_t) ; ushort
-
- ; --------------------------- <sys/types.h> -----------------------------------
-@@ -293,6 +293,8 @@
- ;; for robust mutexes
- (def-c-const EOWNERDEAD (:documentation "Owner died")) ; 130
- (def-c-const ENOTRECOVERABLE (:documentation "State not recoverable")) ; 131
-+(def-c-const ERFKILL (:documentation "Operation not possible due to RF-kill")) ; 132
-+(def-c-const EHWPOISON (:documentation "Memory page has hardware error")) ; 133
-
- ; -------------------------- <bits/errno.h> -----------------------------------
-
-@@ -648,7 +650,6 @@
- (def-call-out calloc (:arguments (nmemb size_t) (size size_t))
- (:return-type c-pointer))
- (def-call-out free (:arguments (ptr c-pointer)) (:return-type nil))
--(def-call-out cfree (:arguments (ptr c-pointer)) (:return-type nil))
- (def-call-out valloc (:arguments (size size_t)) (:return-type c-pointer))
-
- (def-call-out abort (:arguments) (:return-type nil))
diff --git a/clisp-readline.patch b/clisp-readline.patch
deleted file mode 100644
index 19c54f9..0000000
--- a/clisp-readline.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-modules_readline_readline.lisp,v 1.1 2016/09/20 14:10:25 wiz Exp $
-
-rl_readline_state changed from int to unsigned long in readline-7.0.
-
---- modules/readline/readline.lisp.orig 2010-01-06 22:18:03.000000000 +0000
-+++ modules/readline/readline.lisp
-@@ -424,7 +424,7 @@ name in ~/.inputrc. This is preferred wa
- "The version of this incarnation of the readline library, e.g., 0x0402."))
- (def-c-var gnu-readline-p (:name "rl_gnu_readline_p") (:type int)
- (:documentation "True if this is real GNU readline."))
--(def-c-var readline-state (:name "rl_readline_state") (:type int)
-+(def-c-var readline-state (:name "rl_readline_state") (:type ulong)
- (:documentation "Flags word encapsulating the current readline state."))
- (def-c-var editing-mode (:name "rl_editing_mode") (:type int)
- (:documentation "Says which editing mode readline is currently using.
diff --git a/gcc.patch b/gcc.patch
deleted file mode 100644
index e53cfdd..0000000
--- a/gcc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur clisp-2.49.orig/src/makemake.in clisp-2.49/src/makemake.in
---- clisp-2.49.orig/src/makemake.in 2019-09-02 21:04:20.246000000 +0200
-+++ clisp-2.49/src/makemake.in 2019-09-02 21:06:35.346000000 +0200
-@@ -1235,7 +1235,7 @@
- if [ $CROSS = false ] ; then
- case "$XCC_GCC_VERSION" in
- # gcc 2.7 introduced an annoying warning, but gcc 2.8 has a workaround:
-- 2.[8-9]* | 3.* | 4.* | egcs-2.*)
-+ 2.[8-9]* | 3.* | 4.* | 5.* | 6.* | 7.* | 8.* | 9.* | egcs-2.*)
- XCFLAGS=$XCFLAGS' -Wno-sign-compare -Wno-format-nonliteral'
- ;;
- * ) ;;
-@@ -1259,7 +1259,7 @@
- # gcc-2.7.2 has a strength-reduction bug (fixed in gcc-2.7.2.1,
- # also fixed through the specs file of some Linux distributions).
- XCFLAGS=$XCFLAGS' -O2 -fexpensive-optimizations -fno-strength-reduce' ;;
-- 2.3.[2-9]* | 2.[4-9]* | 3.* | 4.* | egcs-2.*)
-+ 2.3.[2-9]* | 2.[4-9]* | 3.* | 4.* | 5.* | 6.* | 7.* | 8.* | 9.* | egcs-2.*)
- XCFLAGS=$XCFLAGS' -O2 -fexpensive-optimizations' ;;
- * )
- XCFLAGS=$XCFLAGS' -O' ;;
-@@ -1278,7 +1278,7 @@
- # egcs-1.0.3 and egcs-1.1.1 produce incorrect code when compiling
- # lisparit (function UDS_divide_).
- XCFLAGS=$XCFLAGS' -O2 -fno-schedule-insns' ;;
-- 2.9* | 3.* | 4.*)
-+ 2.9* | 3.* | 4.* | 5.* | 6.* | 7.* | 8.* | 9.*)
- # gcc-2.95 produces incorrect code when compiling predtype
- # (function C_coerce).
- XCFLAGS=$XCFLAGS' -O2 -fno-schedule-insns -fno-gcse' ;;
-@@ -1313,7 +1313,7 @@
- esac
- fi # !DEBUGGING
- case "$XCC_GCC_VERSION" in
-- 3* | 4*)
-+ 3* | 4* | 5* | 6* | 7* | 8* | 9*)
- # When not optimizing on linux, or with Apple's gcc 4 on MacOS X,
- # or with GCC 4 when "gcc -Os" is used:
- # C_CODE_ALIGNMENT is wrong. &EVAL-WHEN = 0x806D512
diff --git a/x86.patch b/x86.patch
deleted file mode 100644
index 7230850..0000000
--- a/x86.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur clisp-2.49.orig/src/makemake.in clisp-2.49/src/makemake.in
---- clisp-2.49.orig/src/makemake.in 2010-07-07 17:15:35.000000000 +0200
-+++ clisp-2.49/src/makemake.in 2019-09-02 21:04:20.246000000 +0200
-@@ -1138,7 +1138,7 @@
- case "$host_cpu" in
- hppa*) cpu=hppa ;;
- arm*) cpu=arm ;;
-- x86_64) cpu=x86_64 ;;
-+ x86_64) cpu=i686 ;;
- ia64) cpu=ia64 ;;
- mips) cpu=mips ;;
- mips64*) cpu=mips64 ;;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/clisp.git/commitdiff/3a2acc05cc0e4ddb6c3418adde74ca30393e9eac
More information about the pld-cvs-commit
mailing list