pool/clisp
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 143477 from home:toganm:branches:devel:languages:misc

Browse Source 
- Fix build with glibc 2.17 (clisp-glibc-fix.patch)
  * rebase patches to -p1 as stated in the patching guidelines
  * update to libsegsev-2.10

OBS-URL: https://build.opensuse.org/request/show/143477
OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/clisp?expand=0&rev=36
This commit is contained in:
OBS User mrdocs 2012-11-28 21:22:46 +00:00 committed by Git OBS Bridge
parent a07df5f641
commit d5a36a868b
15 changed files with 372 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clisp-2.39-clx.dif
View File

@ -1,6 +1,10 @@
--- modules/clx/new-clx/clx.f ---
+++ modules/clx/new-clx/clx.f 2007-01-24 11:33:44.000000000 +0100 modules/clx/new-clx/clx.f | 6 ++++--
@@ -1563,7 +1563,8 @@ static void general_lookup (object type) 1 file changed, 4 insertions(+), 2 deletions(-)
--- a/modules/clx/new-clx/clx.f
+++ b/modules/clx/new-clx/clx.f
@@ -1721,7 +1721,8 @@ static void general_lookup (object type)
DEFUN(XLIB:##L##-ID,xxx) \ DEFUN(XLIB:##L##-ID,xxx) \
{ VALUES1(make_uint29((XID)get_##c (popSTACK()))); } \ { VALUES1(make_uint29((XID)get_##c (popSTACK()))); } \
DEFUN(XLIB:##L##-EQUAL,xxx yyy) \ DEFUN(XLIB:##L##-EQUAL,xxx yyy) \
@ -10,7 +14,7 @@
DEFUN(XLIB:LOOKUP-##L,display xxx) \ DEFUN(XLIB:LOOKUP-##L,display xxx) \
{ general_lookup (`XLIB::##L##`); } { general_lookup (`XLIB::##L##`); }
@@ -1580,7 +1581,8 @@ static void general_lookup (object type) @@ -1738,7 +1739,8 @@ static void general_lookup (object type)
DEFUN(XLIB:##L##-P,xxx) \ DEFUN(XLIB:##L##-P,xxx) \
{ VALUES_IF(c##_p (popSTACK())); } \ { VALUES_IF(c##_p (popSTACK())); } \
DEFUN(XLIB:##L##-EQUAL,xxx yyy) \ DEFUN(XLIB:##L##-EQUAL,xxx yyy) \

10
clisp-2.39-ia64-wooh.dif
View File

@ -1,6 +1,10 @@
--- tests/streams.tst ---
+++ tests/streams.tst 2006-07-25 15:58:55.000000000 +0000 tests/streams.tst | 4 ++--
@@ -1031,8 +1031,8 @@ T 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/tests/streams.tst
+++ b/tests/streams.tst
@@ -1036,8 +1036,8 @@ T
(describe (make-array nil :element-type nil) s))) (describe (make-array nil :element-type nil) s)))
T T

18
clisp-2.44.1-ia64.dif
View File

@ -1,5 +1,11 @@
--- ffcall-1.10+2.43/avcall/avcall-ia64.s ---
+++ ffcall-1.10+2.43/avcall/avcall-ia64.s 2006-07-21 16:24:20.000000000 +0200 ffcall-1.10+2.43/avcall/avcall-ia64.s | 1071 ++++++++++++-----------
ffcall-1.10+2.43/avcall/avcall.h.in | 4
ffcall-1.10+2.43/callback/vacall_r/vacall_r.h.in | 4
3 files changed, 581 insertions(+), 498 deletions(-)
--- a/ffcall-1.10+2.43/avcall/avcall-ia64.s
+++ b/ffcall-1.10+2.43/avcall/avcall-ia64.s
@@ -1,739 +1,822 @@ @@ -1,739 +1,822 @@
.file "avcall-ia64.c" .file "avcall-ia64.c"
- .version "01.01" - .version "01.01"
@ -1317,8 +1323,8 @@
.endp __builtin_avcall# .endp __builtin_avcall#
- .ident "GCC: (GNU) 2.9-ia64-000216 snap-000324" - .ident "GCC: (GNU) 2.9-ia64-000216 snap-000324"
+ .ident "GCC: (GNU) 4.1.0 (SUSE Linux)" + .ident "GCC: (GNU) 4.1.0 (SUSE Linux)"
--- ffcall-1.10+2.43/avcall/avcall.h.in --- a/ffcall-1.10+2.43/avcall/avcall.h.in
+++ ffcall-1.10+2.43/avcall/avcall.h.in 2006-07-19 17:19:49.000000000 +0200 +++ b/ffcall-1.10+2.43/avcall/avcall.h.in
@@ -1112,7 +1112,7 @@ typedef struct @@ -1112,7 +1112,7 @@ typedef struct
* different alignment. * different alignment.
*/ */
@ -1337,8 +1343,8 @@
/* Types larger than a word have 2-word alignment. */ /* Types larger than a word have 2-word alignment. */
#define __av_struct(LIST,TYPE,TYPE_SIZE,TYPE_ALIGN,ASSIGN,VAL) \ #define __av_struct(LIST,TYPE,TYPE_SIZE,TYPE_ALIGN,ASSIGN,VAL) \
((LIST).aptr = (__avword*)(((__avword)(LIST).aptr+(TYPE_SIZE)+__av_struct_alignment(TYPE_ALIGN)-1) & -(long)__av_struct_alignment(TYPE_ALIGN)), \ ((LIST).aptr = (__avword*)(((__avword)(LIST).aptr+(TYPE_SIZE)+__av_struct_alignment(TYPE_ALIGN)-1) & -(long)__av_struct_alignment(TYPE_ALIGN)), \
--- ffcall-1.10+2.43/callback/vacall_r/vacall_r.h.in --- a/ffcall-1.10+2.43/callback/vacall_r/vacall_r.h.in
+++ ffcall-1.10+2.43/callback/vacall_r/vacall_r.h.in 2006-07-19 17:23:49.000000000 +0200 +++ b/ffcall-1.10+2.43/callback/vacall_r/vacall_r.h.in
@@ -1059,7 +1059,7 @@ typedef __va_alist* va_alist; @@ -1059,7 +1059,7 @@ typedef __va_alist* va_alist;
#endif #endif
#define __va_align_struct(LIST,TYPE_SIZE,TYPE_ALIGN) \ #define __va_align_struct(LIST,TYPE_SIZE,TYPE_ALIGN) \

10
clisp-2.44.1-map_private.patch
View File

@ -1,6 +1,10 @@
--- ffcall-1.10+2.43/callback/trampoline_r/trampoline.c ---
+++ ffcall-1.10+2.43/callback/trampoline_r/trampoline.c 2003-12-10 23:14:50.000000000 -0800 ffcall-1.10+2.43/callback/trampoline_r/trampoline.c | 2 +-
@@ -452,7 +452,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/ffcall-1.10+2.43/callback/trampoline_r/trampoline.c
+++ b/ffcall-1.10+2.43/callback/trampoline_r/trampoline.c
@@ -368,7 +368,7 @@ __TR_function alloc_trampoline_r (__TR_f
{ /* Get a new page. */ { /* Get a new page. */
char* page; char* page;
#ifdef EXECUTABLE_VIA_MMAP_ANONYMOUS #ifdef EXECUTABLE_VIA_MMAP_ANONYMOUS

8
clisp-2.44.1-map_variable.patch
View File

@ -1,5 +1,9 @@
--- ffcall-1.10+2.43/callback/trampoline_r/trampoline_r.h.in ---
+++ ffcall-1.10+2.43/callback/trampoline_r/trampoline_r.h.in 2003-12-10 22:04:30.000000000 -0800 ffcall-1.10+2.43/callback/trampoline_r/trampoline_r.h.in | 5 +++++
1 file changed, 5 insertions(+)
--- a/ffcall-1.10+2.43/callback/trampoline_r/trampoline_r.h.in
+++ b/ffcall-1.10+2.43/callback/trampoline_r/trampoline_r.h.in
@@ -22,4 +22,9 @@ extern __TR_function trampoline_r_addres @@ -22,4 +22,9 @@ extern __TR_function trampoline_r_addres
extern void* trampoline_r_data0 (void*); extern void* trampoline_r_data0 (void*);
extern void* trampoline_r_data1 (void*); extern void* trampoline_r_data1 (void*);

8
clisp-2.49-personality.patch
View File

@ -1,5 +1,9 @@
--- src/_clisp.c ---
+++ src/_clisp.c 2010-07-14 13:14:48.983463701 +0000 src/_clisp.c | 11 +++++++++++
1 file changed, 11 insertions(+)
--- a/src/_clisp.c
+++ b/src/_clisp.c
@@ -46,6 +46,11 @@ @@ -46,6 +46,11 @@
/* Declare stderr, perror(). */ /* Declare stderr, perror(). */
# include <stdio.h> # include <stdio.h>

234
clisp-2.49.dif
View File

@ -1,5 +1,23 @@
--- configure ---
+++ configure 2010-07-15 08:38:16.978924992 +0000 configure | 6 --
ffcall-1.10+2.43/build-aux/config.guess | 1
ffcall-1.10+2.43/callback/trampoline_r/trampoline.c | 4 -
modules/clx/new-clx/clx.lisp | 1
modules/clx/new-clx/demos/clx-demos.lisp | 2
modules/clx/new-clx/demos/koch.lisp | 29 ++++++++++
modules/clx/new-clx/demos/qix.lisp | 30 ++++++++++-
modules/clx/new-clx/demos/sokoban.lisp | 34 +++++++++++-
modules/postgresql/link.sh.in | 2
src/aclocal.m4 | 2
src/build-aux/config.guess | 54 ++++++++++----------
src/lispbibl.d | 16 ++++-
src/makemake.in | 10 +++
utils/gctrigger.c | 1
utils/modprep.lisp | 2
15 files changed, 145 insertions(+), 49 deletions(-)
--- a/configure
+++ b/configure
@@ -393,11 +393,11 @@ do @@ -393,11 +393,11 @@ do
passnext=both ;; passnext=both ;;
@ -26,8 +44,8 @@
subdir_configure_args="$subdir_configure_args $arg" subdir_configure_args="$subdir_configure_args $arg"
prev=host prev=host
passnext=configure ;; passnext=configure ;;
--- ffcall-1.10+2.43/build-aux/config.guess --- a/ffcall-1.10+2.43/build-aux/config.guess
+++ ffcall-1.10+2.43/build-aux/config.guess 2008-02-25 13:00:18.000000000 +0000 +++ b/ffcall-1.10+2.43/build-aux/config.guess
@@ -985,6 +985,7 @@ EOF @@ -985,6 +985,7 @@ EOF
exit ;; exit ;;
esac esac
@ -36,8 +54,8 @@
eval $set_cc_for_build eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c sed 's/^ //' << EOF >$dummy.c
#include <features.h> #include <features.h>
--- ffcall-1.10+2.43/callback/trampoline_r/trampoline.c --- a/ffcall-1.10+2.43/callback/trampoline_r/trampoline.c
+++ ffcall-1.10+2.43/callback/trampoline_r/trampoline.c 2008-02-25 13:00:18.000000000 +0000 +++ b/ffcall-1.10+2.43/callback/trampoline_r/trampoline.c
@@ -191,15 +191,11 @@ extern RETGETPAGESIZETYPE getpagesize (v @@ -191,15 +191,11 @@ extern RETGETPAGESIZETYPE getpagesize (v
#ifdef ultrix #ifdef ultrix
#include <mips/cachectl.h> #include <mips/cachectl.h>
@ -54,8 +72,8 @@
#ifdef __m88k__ #ifdef __m88k__
#include <sys/syslocal.h> #include <sys/syslocal.h>
#endif #endif
--- modules/clx/new-clx/clx.lisp --- a/modules/clx/new-clx/clx.lisp
+++ modules/clx/new-clx/clx.lisp 2008-02-25 13:00:18.000000000 +0000 +++ b/modules/clx/new-clx/clx.lisp
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
;;;; -------------------------------------------------------------------------- ;;;; --------------------------------------------------------------------------
;;;; Exports ;;;; Exports
@ -64,8 +82,8 @@
(export (export
'(*version* access-control access-error access-hosts activate-screen-saver '(*version* access-control access-error access-hosts activate-screen-saver
add-access-host add-resource add-to-save-set alist alloc-color add-access-host add-resource add-to-save-set alist alloc-color
--- modules/clx/new-clx/demos/clx-demos.lisp --- a/modules/clx/new-clx/demos/clx-demos.lisp
+++ modules/clx/new-clx/demos/clx-demos.lisp 2010-07-14 12:49:25.000000000 +0000 +++ b/modules/clx/new-clx/demos/clx-demos.lisp
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
(defparameter *demos* (defparameter *demos*
@ -75,8 +93,8 @@
(recurrence) (plaid) (clclock) (bball) (bwindow))) (recurrence) (plaid) (clclock) (bball) (bwindow)))
(defmacro do-demos ((fun-var) &body body) (defmacro do-demos ((fun-var) &body body)
--- modules/clx/new-clx/demos/koch.lisp --- a/modules/clx/new-clx/demos/koch.lisp
+++ modules/clx/new-clx/demos/koch.lisp 2008-02-25 13:00:18.000000000 +0000 +++ b/modules/clx/new-clx/demos/koch.lisp
@@ -7,7 +7,30 @@ @@ -7,7 +7,30 @@
;;; $Id: koch.lisp,v 1.5 2008/06/25 23:05:28 sds Exp $ ;;; $Id: koch.lisp,v 1.5 2008/06/25 23:05:28 sds Exp $
;;; $Source: /cvsroot/clisp/clisp/modules/clx/new-clx/demos/koch.lisp,v $ ;;; $Source: /cvsroot/clisp/clisp/modules/clx/new-clx/demos/koch.lisp,v $
@ -88,7 +106,7 @@
+ (:shadowing-import-from "XLIB" "CHAR-WIDTH") ; EXT has CHAR-WIDTH + (:shadowing-import-from "XLIB" "CHAR-WIDTH") ; EXT has CHAR-WIDTH
+ (:export "KOCH")) + (:export "KOCH"))
+ +
+(in-package :koch) +(in-package :koch)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(defun x-host-display (&optional (disp (getenv "DISPLAY"))) +(defun x-host-display (&optional (disp (getenv "DISPLAY")))
+ "Parse the DISPLAY environment variable. + "Parse the DISPLAY environment variable.
@ -118,8 +136,8 @@
+~% Call (koch:koch)~%~%") +~% Call (koch:koch)~%~%")
+ +
(provide "koch") (provide "koch")
--- modules/clx/new-clx/demos/qix.lisp --- a/modules/clx/new-clx/demos/qix.lisp
+++ modules/clx/new-clx/demos/qix.lisp 2008-02-25 13:00:18.000000000 +0000 +++ b/modules/clx/new-clx/demos/qix.lisp
@@ -14,7 +14,30 @@ @@ -14,7 +14,30 @@
;;;; o or a spline option?! ;;;; o or a spline option?!
;;;; ;;;;
@ -162,8 +180,8 @@
+~% Call (qix:qix) or (qix:qix :delay 0)~%~%") +~% Call (qix:qix) or (qix:qix :delay 0)~%~%")
+ +
(provide "qix") (provide "qix")
--- modules/clx/new-clx/demos/sokoban.lisp --- a/modules/clx/new-clx/demos/sokoban.lisp
+++ modules/clx/new-clx/demos/sokoban.lisp 2008-02-25 13:00:18.000000000 +0000 +++ b/modules/clx/new-clx/demos/sokoban.lisp
@@ -41,7 +41,30 @@ @@ -41,7 +41,30 @@
;;;; - maximum field size is hard wired to 20x20. (This is not in the LISP spirit!) ;;;; - maximum field size is hard wired to 20x20. (This is not in the LISP spirit!)
;;;; - sometimes the programm could not count correctly ... ;;;; - sometimes the programm could not count correctly ...
@ -217,8 +235,8 @@
+(format t "~&~% Call (sokoban:sokoban)~%~%") +(format t "~&~% Call (sokoban:sokoban)~%~%")
+ +
(provide "sokoban") (provide "sokoban")
--- modules/postgresql/link.sh.in --- a/modules/postgresql/link.sh.in
+++ modules/postgresql/link.sh.in 2008-02-25 13:00:18.000000000 +0000 +++ b/modules/postgresql/link.sh.in
@@ -4,5 +4,5 @@ ${MAKE-make} clisp-module \ @@ -4,5 +4,5 @@ ${MAKE-make} clisp-module \
NEW_MODULES='postgresql' NEW_MODULES='postgresql'
NEW_FILES='' NEW_FILES=''
@ -226,8 +244,8 @@
-NEW_LIBS="${NEW_FILES} @LIBS@" -NEW_LIBS="${NEW_FILES} @LIBS@"
+NEW_LIBS="${NEW_FILES} @LIBS@ -lcrypt -lssl" +NEW_LIBS="${NEW_FILES} @LIBS@ -lcrypt -lssl"
TO_LOAD='postgresql sql' TO_LOAD='postgresql sql'
--- src/aclocal.m4 --- a/src/aclocal.m4
+++ src/aclocal.m4 2008-02-25 13:00:18.000000000 +0000 +++ b/src/aclocal.m4
@@ -6668,7 +6668,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], @@ -6668,7 +6668,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
dnl When using libtool, the option that works for both libraries and dnl When using libtool, the option that works for both libraries and
dnl executables is -R. The -R options are cumulative. dnl executables is -R. The -R options are cumulative.
@ -237,89 +255,8 @@
done done
fi fi
popdef([P_A_C_K]) popdef([P_A_C_K])
--- src/lispbibl.d --- a/src/build-aux/config.guess
+++ src/lispbibl.d 2010-07-14 12:53:05.000000000 +0000 +++ b/src/build-aux/config.guess
@@ -121,7 +121,7 @@
#define PC386 /* IBMPC-compatible with 80386/80486-processor */
#endif
#ifdef GENERIC_UNIX
- #if (defined(unix) && (defined(linux) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) && (defined(i386) || defined(__i386__) || defined(__x86_64__) || defined(__amd64__)))
+ #if (defined(unix) && ((defined(linux) || defined(__linux__)) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) && (defined(i386) || defined(__i386__) || defined(__x86_64__) || defined(__amd64__)))
#define PC386
#endif
#if (defined(sun) && defined(unix) && defined(sparc))
@@ -218,8 +218,14 @@
#endif
#ifdef GENERIC_UNIX
#define UNIX
- #ifdef __linux__
+ #if defined(__linux__) || defined(linux)
#define UNIX_LINUX /* Linux (Linus Torvalds Unix) */
+ #ifndef linux
+ #define linux
+ #endif
+ #ifndef __linux__
+ #define __linux__
+ #endif
#endif
#ifdef __GNU__
#define UNIX_HURD /* the GNU system (Hurd + glibc) */
@@ -1245,7 +1251,7 @@ typedef signed int signean;
address of its component 'ident' and return it as number: */
#include <stddef.h>
#ifndef offsetof
- #define offsetof(type,ident) ((ULONG)&(((type*)0)->ident))
+ #define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
#endif
/* Determine the offset of an array 'ident' in a struct of the type 'type': */
#if defined(__cplusplus) || defined(MICROSOFT)
@@ -3312,9 +3318,9 @@ typedef signed_int_with_n_bits(intVsize)
type_data_object(type,data) */
#if defined(WIDE) && defined(WIDE_STRUCT)
#if BIG_ENDIAN_P==WIDE_ENDIANNESS
- #define type_data_object(type,data) ((object){{(tint)(type),(aint)(data)}INIT_ALLOCSTAMP})
+ #define type_data_object(type,data) (object){{(tint)(type),(aint)(data)}INIT_ALLOCSTAMP}
#else
- #define type_data_object(type,data) ((object){{(aint)(data),(tint)(type)}INIT_ALLOCSTAMP})
+ #define type_data_object(type,data) (object){{(aint)(data),(tint)(type)}INIT_ALLOCSTAMP}
#endif
#elif !(oint_addr_shift==0)
#define type_data_object(type,data) \
--- src/makemake.in
+++ src/makemake.in 2010-07-16 09:24:56.183425374 +0000
@@ -228,6 +228,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false}
# Handle --with-... arguments
while test -z "$endofargs"; do
case "$1" in
+ -ignore* | --ignore* )
+ shift
+ ;;
-verb* | --verb* )
verbose=`echol "$1"|sed 's/-*v[^=]*=*//'`
test -n "${verbose}" || verbose=true
@@ -1335,6 +1338,10 @@ if [ $XCC_GCC = true ] ; then
XCFLAGS=${XCFLAGS}" -pthread"
fi
+ if [ -n "${MYCFLAGS}" ] ; then
+ XCFLAGS=$XCFLAGS' ${MYCFLAGS} '
+ fi
+
else
if [ $TSYS = sun4 -a $CROSS = false ] ; then
@@ -3593,7 +3600,8 @@ if [ $CROSS = false ] ; then
echotab " mkdir -p \"\$\$absdest/\$\$m\"; \\"
echotab " cd \$\$m; \$(MAKE) clisp-module-distrib LN=\"\$(INSTALL_DATA)\" distribdir=\"\$\$absdest/\$\$m\" ; cd \"\$\$here\"; \\"
echotab " done; fi"
- line='linkkit/* base/*'
+ echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/full"
+ line='linkkit/* base/* full/*'
else
echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/full"
line='linkkit/* base/* full/*'
--- src/build-aux/config.guess
+++ src/build-aux/config.guess 2010-07-14 13:01:48.000000000 +0000
@@ -870,29 +870,29 @@ EOF @@ -870,29 +870,29 @@ EOF
esac esac
objdump --private-headers /bin/sh | grep -q ld.so.1 objdump --private-headers /bin/sh | grep -q ld.so.1
@ -446,8 +383,89 @@
exit ;; exit ;;
i*86:DYNIX/ptx:4*:*) i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
--- utils/gctrigger.c --- a/src/lispbibl.d
+++ utils/gctrigger.c 2008-02-25 13:00:18.000000000 +0000 +++ b/src/lispbibl.d
@@ -121,7 +121,7 @@
#define PC386 /* IBMPC-compatible with 80386/80486-processor */
#endif
#ifdef GENERIC_UNIX
- #if (defined(unix) && (defined(linux) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) && (defined(i386) || defined(__i386__) || defined(__x86_64__) || defined(__amd64__)))
+ #if (defined(unix) && ((defined(linux) || defined(__linux__)) || defined(__CYGWIN32__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)) && (defined(i386) || defined(__i386__) || defined(__x86_64__) || defined(__amd64__)))
#define PC386
#endif
#if (defined(sun) && defined(unix) && defined(sparc))
@@ -218,8 +218,14 @@
#endif
#ifdef GENERIC_UNIX
#define UNIX
- #ifdef __linux__
+ #if defined(__linux__) || defined(linux)
#define UNIX_LINUX /* Linux (Linus Torvalds Unix) */
+ #ifndef linux
+ #define linux
+ #endif
+ #ifndef __linux__
+ #define __linux__
+ #endif
#endif
#ifdef __GNU__
#define UNIX_HURD /* the GNU system (Hurd + glibc) */
@@ -1245,7 +1251,7 @@ typedef signed int signean;
address of its component 'ident' and return it as number: */
#include <stddef.h>
#ifndef offsetof
- #define offsetof(type,ident) ((ULONG)&(((type*)0)->ident))
+ #define offsetof(type,ident) ((size_t)&(((type*)0)->ident))
#endif
/* Determine the offset of an array 'ident' in a struct of the type 'type': */
#if defined(__cplusplus) || defined(MICROSOFT)
@@ -3312,9 +3318,9 @@ typedef signed_int_with_n_bits(intVsize)
type_data_object(type,data) */
#if defined(WIDE) && defined(WIDE_STRUCT)
#if BIG_ENDIAN_P==WIDE_ENDIANNESS
- #define type_data_object(type,data) ((object){{(tint)(type),(aint)(data)}INIT_ALLOCSTAMP})
+ #define type_data_object(type,data) (object){{(tint)(type),(aint)(data)}INIT_ALLOCSTAMP}
#else
- #define type_data_object(type,data) ((object){{(aint)(data),(tint)(type)}INIT_ALLOCSTAMP})
+ #define type_data_object(type,data) (object){{(aint)(data),(tint)(type)}INIT_ALLOCSTAMP}
#endif
#elif !(oint_addr_shift==0)
#define type_data_object(type,data) \
--- a/src/makemake.in
+++ b/src/makemake.in
@@ -228,6 +228,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false}
# Handle --with-... arguments
while test -z "$endofargs"; do
case "$1" in
+ -ignore* | --ignore* )
+ shift
+ ;;
-verb* | --verb* )
verbose=`echol "$1"|sed 's/-*v[^=]*=*//'`
test -n "${verbose}" || verbose=true
@@ -1335,6 +1338,10 @@ if [ $XCC_GCC = true ] ; then
XCFLAGS=${XCFLAGS}" -pthread"
fi
+ if [ -n "${MYCFLAGS}" ] ; then
+ XCFLAGS=$XCFLAGS' ${MYCFLAGS} '
+ fi
+
else
if [ $TSYS = sun4 -a $CROSS = false ] ; then
@@ -3593,7 +3600,8 @@ if [ $CROSS = false ] ; then
echotab " mkdir -p \"\$\$absdest/\$\$m\"; \\"
echotab " cd \$\$m; \$(MAKE) clisp-module-distrib LN=\"\$(INSTALL_DATA)\" distribdir=\"\$\$absdest/\$\$m\" ; cd \"\$\$here\"; \\"
echotab " done; fi"
- line='linkkit/* base/*'
+ echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/full"
+ line='linkkit/* base/* full/*'
else
echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/full"
line='linkkit/* base/* full/*'
--- a/utils/gctrigger.c
+++ b/utils/gctrigger.c
@@ -599,6 +599,7 @@ static inline void VectorToken_delete (V @@ -599,6 +599,7 @@ static inline void VectorToken_delete (V
static Token nexttoken (boolean within_prep_directive) static Token nexttoken (boolean within_prep_directive)
{ {
@ -456,8 +474,8 @@
restart: restart:
{ int c = next_char(); { int c = next_char();
switch (c) { switch (c) {
--- utils/modprep.lisp --- a/utils/modprep.lisp
+++ utils/modprep.lisp 2008-02-25 13:00:18.000000000 +0000 +++ b/utils/modprep.lisp
@@ -345,7 +345,7 @@ FOO(bar,baz,zot) ==> FOO; (bar baz zot); @@ -345,7 +345,7 @@ FOO(bar,baz,zot) ==> FOO; (bar baz zot);
((or (char= cc #\_) (char= cc #\-)) (write-char #\_ out)) ((or (char= cc #\_) (char= cc #\-)) (write-char #\_ out))
(t (format out "_~2,'0x" (char-code cc)))))) (t (format out "_~2,'0x" (char-code cc))))))

31
clisp-glibc-fix.patch Normal file
View File

@ -0,0 +1,31 @@
From: Togan Muftuoglu <toganm@opensuse.org>
Date: Access: 2012-11-28 16:13:07 +0100
Referencens: http://comments.gmane.org/gmane.comp.lib.glibc.alpha/25618
Subject: remove __swblk_t from linux.lisp
Upstream: no
Glibc got rid of unused __swblk_t type, so the linux.lisp package needs to
be updated, enabling build
---
modules/bindings/glibc/linux.lisp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/modules/bindings/glibc/linux.lisp
+++ b/modules/bindings/glibc/linux.lisp
@@ -38,7 +38,6 @@
; =========================== <sys/types.h> ===================================
(c-lines "#include <sys/types.h>~%")
-
; --------------------------- <gnu/types.h> -----------------------------------
(def-c-type __u_char uchar)
@@ -67,7 +66,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)

8
clisp-linux.patch
View File

@ -1,5 +1,9 @@
--- ./modules/bindings/glibc/linux.lisp.orig 2008-10-08 10:36:19.000000000 -0600 ---
+++ ./modules/bindings/glibc/linux.lisp 2012-07-25 19:05:07.014592097 -0600 modules/bindings/glibc/linux.lisp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/modules/bindings/glibc/linux.lisp
+++ b/modules/bindings/glibc/linux.lisp
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
(def-c-type __key_t) ; int (def-c-type __key_t) ; int

8
clisp.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Nov 28 15:03:30 UTC 2012 - toganm@opensuse.org
- Fix build with glibc 2.17 (clisp-glibc-fix.patch)
* rebase patches to -p1 as stated in the patching guidelines
* update to libsegsev-2.10
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 27 20:10:16 UTC 2012 - aj@suse.de Fri Jul 27 20:10:16 UTC 2012 - aj@suse.de

134
clisp.spec
View File

@ -38,7 +38,7 @@ BuildRequires: xorg-x11-devel
# gcc-c++ # gcc-c++
# to BuildRequires # to BuildRequires
# #
%define debug no %define debug no
Requires(pre): vim Requires(pre): vim
Version: 2.49 Version: 2.49
Release: 0 Release: 0
@ -50,7 +50,7 @@ Source0: http://switch.dl.sourceforge.net/sourceforge/clisp/clisp-2.49.ta
# Original source at http://www.haible.de/bruno/gnu/ffcall-1.10.tar.gz # Original source at http://www.haible.de/bruno/gnu/ffcall-1.10.tar.gz
# adopted to work with clisp-2.43 and higher # adopted to work with clisp-2.43 and higher
Source1: ffcall-1.10+2.43.tar.bz2 Source1: ffcall-1.10+2.43.tar.bz2
Source2: ftp://ftp.gnu.org/pub/gnu/libsigsegv/libsigsegv-2.9.tar.gz Source2: ftp://ftp.gnu.org/pub/gnu/libsigsegv/libsigsegv-2.10.tar.gz
Source3: clisp-rpmlintrc Source3: clisp-rpmlintrc
Source4: README.SuSE Source4: README.SuSE
Patch0: clisp-2.49.dif Patch0: clisp-2.49.dif
@ -63,9 +63,10 @@ Patch8: clisp-2.39-clx.dif
Patch10: ffcall-1.10+2.43.dif Patch10: ffcall-1.10+2.43.dif
Patch11: fix-build-in-qemu.patch Patch11: fix-build-in-qemu.patch
Patch12: clisp-linux.patch Patch12: clisp-linux.patch
Patch13: clisp-glibc-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%global vimdir %{_datadir}/vim/site/after/syntax %global vimdir %{_datadir}/vim/site/after/syntax
%global xarch ppc64 s390x armv4l %global xarch ppc64 s390x armv4l
ExcludeArch: ppc64 s390x armv4l ExcludeArch: ppc64 s390x armv4l
%description %description
@ -96,19 +97,22 @@ contains two nice applications.
%prep %prep
%setup -qT -b0 -a1 -a2 %setup -qT -b0 -a1 -a2
%patch1 -p0 -b .mappriv %patch1 -p1 -b .mappriv
%patch2 -p0 -b .mapvar %patch2 -p1 -b .mapvar
%patch3 -p0 -b .sel %patch3 -p1 -b .sel
%patch4 -p0 -b .ia64 %patch4 -p1 -b .ia64
%patch7 -p0 -b .wooh %patch7 -p1 -b .wooh
%patch8 -p0 -b .clx %patch8 -p1 -b .clx
%patch10 -p0 -b .ffcall %patch10 -p1 -b .ffcall
%patch0 %patch0 -p1
%if 0%{?qemu_user_space_build:1} %if 0%{?qemu_user_space_build:1}
# qemu does not support stack overflows well ;) # qemu does not support stack overflows well ;)
%patch11 -p0 -b .qemu %patch11 -p1 -b .qemu
%endif
%patch12 -p1
%if 0%{?suse_version} > 1220
%patch13 -p1 -b .glibc
%endif %endif
%patch12 -p0
%build %build
# #
@ -135,15 +139,15 @@ else
fi fi
CC="${CC} -g ${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -pipe" CC="${CC} -g ${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -pipe"
case "$RPM_ARCH" in case "$RPM_ARCH" in
i[0-9]86) CC="${CC} -falign-functions=4 -mieee-fp -ffloat-store" ;; i[0-9]86) CC="${CC} -falign-functions=4 -mieee-fp -ffloat-store" ;;
ppc) CC="${CC}" ;; ppc) CC="${CC}" ;;
s390) CC="${CC}" ;; s390) CC="${CC}" ;;
x86_64) CC="${CC} -fno-gcse" ;; x86_64) CC="${CC} -fno-gcse" ;;
sparc*) CC="${CC} -fno-gcse" ;; sparc*) CC="${CC} -fno-gcse" ;;
ppc64) CC="${CC} -fno-gcse -mpowerpc64" ;; ppc64) CC="${CC} -fno-gcse -mpowerpc64" ;;
s390x) CC="${CC} -fno-gcse" ;; s390x) CC="${CC} -fno-gcse" ;;
ia64) CC="${CC} -fno-gcse" ;; ia64) CC="${CC} -fno-gcse" ;;
axp|alpha) CC="${CC}" ;; axp|alpha) CC="${CC}" ;;
esac esac
noexec='-DLINUX_NOEXEC_HEAPCODES' noexec='-DLINUX_NOEXEC_HEAPCODES'
nommap='-DNO_MULTIMAP_SHM -DNO_MULTIMAP_FILE -DNO_SINGLEMAP -DNO_TRIVIALMAP' nommap='-DNO_MULTIMAP_SHM -DNO_MULTIMAP_FILE -DNO_SINGLEMAP -DNO_TRIVIALMAP'
@ -151,15 +155,15 @@ safety='-DSAFETY=3 -O'
MYCFLAGS="${MYCFLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" MYCFLAGS="${MYCFLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
MYCFLAGS="${MYCFLAGS} -D_GNU_SOURCE -Wno-unused -Wno-uninitialized" MYCFLAGS="${MYCFLAGS} -D_GNU_SOURCE -Wno-unused -Wno-uninitialized"
case "$RPM_ARCH" in case "$RPM_ARCH" in
i[0-9]86) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; i[0-9]86) MYCFLAGS="${MYCFLAGS} ${noexec}" ;;
ppc) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; ppc) MYCFLAGS="${MYCFLAGS} ${noexec}" ;;
s390) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; s390) MYCFLAGS="${MYCFLAGS} ${noexec}" ;;
x86_64) MYCFLAGS="${MYCFLAGS} ${safety}" ;; x86_64) MYCFLAGS="${MYCFLAGS} ${safety}" ;;
sparc*) MYCFLAGS="${MYCFLAGS} ${safety}" ;; sparc*) MYCFLAGS="${MYCFLAGS} ${safety}" ;;
ppc64) MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD" ;; ppc64) MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD" ;;
s390x) MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD" ;; s390x) MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD" ;;
ia64) MYCFLAGS="${MYCFLAGS} ${safety}" ;; ia64) MYCFLAGS="${MYCFLAGS} ${safety}" ;;
axp|alpha) MYCFLAGS="${MYCFLAGS} ${nommap}" ;; axp|alpha) MYCFLAGS="${MYCFLAGS} ${nommap}" ;;
esac esac
export CC export CC
export MYCFLAGS export MYCFLAGS
@ -192,8 +196,8 @@ unset CFLAGS
SEGV=${PWD}/libsigsegv SEGV=${PWD}/libsigsegv
pushd libsigsegv-*/ pushd libsigsegv-*/
./configure --build ${SYSTEM} ${DEBUG}\ ./configure --build ${SYSTEM} ${DEBUG}\
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--libdir=%{_libdir} --libdir=%{_libdir}
make make
make check make check
make DESTDIR=${SEGV} install make DESTDIR=${SEGV} install
@ -206,8 +210,8 @@ SEGV=${SEGV}/usr
FFCALL=${PWD}/ffcall FFCALL=${PWD}/ffcall
pushd ffcall-* pushd ffcall-*
./configure --build ${SYSTEM} ${DEBUG}\ ./configure --build ${SYSTEM} ${DEBUG}\
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--libdir=%{_libdir} --libdir=%{_libdir}
make -C avcall make -C avcall
make -C callback make -C callback
make -C avcall check make -C avcall check
@ -225,35 +229,35 @@ find -name configure | xargs -r \
# The modules i18n, syscalls, regexp # The modules i18n, syscalls, regexp
# are part of the base clisp system. # are part of the base clisp system.
# #
./configure --build ${SYSTEM} ${DEBUG} \ ./configure --build ${SYSTEM} ${DEBUG} \
--prefix=%{_prefix} \ --prefix=%{_prefix} \
--exec-prefix=%{_prefix} \ --exec-prefix=%{_prefix} \
--libdir=%{_libdir} \ --libdir=%{_libdir} \
--vimdir=%{vimdir} \ --vimdir=%{vimdir} \
--fsstnd=suse \ --fsstnd=suse \
--with-readline \ --with-readline \
--with-libsigsegv-prefix=${SEGV}\ --with-libsigsegv-prefix=${SEGV}\
%ifnarch %xarch %ifnarch %xarch
--with-libffcall-prefix=${FFCALL}\ --with-libffcall-prefix=${FFCALL}\
%else %else
--without-ffcall \ --without-ffcall \
%endif %endif
--with-dynamic-modules \ --with-dynamic-modules \
--with-gettext \ --with-gettext \
%if 0%{?suse_version} >= %min_suse_ver %if 0%{?suse_version} >= %min_suse_ver
--with-module=dbus \ --with-module=dbus \
%endif %endif
--with-module=queens \ --with-module=queens \
--with-module=gdbm \ --with-module=gdbm \
--with-module=gtk2 \ --with-module=gtk2 \
--with-module=pcre \ --with-module=pcre \
--with-module=rawsock \ --with-module=rawsock \
--with-module=zlib \ --with-module=zlib \
--with-module=wildcard \ --with-module=wildcard \
--with-module=bindings/glibc \ --with-module=bindings/glibc \
--with-module=clx/new-clx \ --with-module=clx/new-clx \
--with-module=berkeley-db \ --with-module=berkeley-db \
--with-module=postgresql --with-module=postgresql
pushd src/ pushd src/
make make
make check make check
@ -281,12 +285,12 @@ CLXLIB=${LSPLIB}/full
# Install the current system # Install the current system
# #
pushd src/ pushd src/
make install prefix=%{_prefix} \ make install prefix=%{_prefix} \
exec_prefix=%{_prefix} \ exec_prefix=%{_prefix} \
mandir=%{_mandir} \ mandir=%{_mandir} \
libdir=%{_libdir} \ libdir=%{_libdir} \
DESTDIR=%{buildroot} \ DESTDIR=%{buildroot} \
INSTALL_DATA='install -cm 0444' INSTALL_DATA='install -cm 0444'
popd popd
# #
# The CLX interface # The CLX interface

122
ffcall-1.10+2.43.dif
View File

@ -1,5 +1,31 @@
--- ffcall-1.10+2.43/avcall/Makefile.in ---
+++ ffcall-1.10+2.43/avcall/Makefile.in 2008-02-25 14:49:20.095314920 +0100 ffcall-1.10+2.43/avcall/Makefile.in | 40 -
ffcall-1.10+2.43/avcall/avcall-mips.S | 774 +++++++++-----------
ffcall-1.10+2.43/avcall/avcall-mips.c | 147 ++-
ffcall-1.10+2.43/avcall/avcall.h.in | 37
ffcall-1.10+2.43/callback/Makefile.in | 40 -
ffcall-1.10+2.43/callback/trampoline_r/Makefile.in | 36
ffcall-1.10+2.43/callback/trampoline_r/cache-arm.c | 16
ffcall-1.10+2.43/callback/trampoline_r/cache-arm.s | 15
ffcall-1.10+2.43/callback/trampoline_r/configure.in | 2
ffcall-1.10+2.43/callback/trampoline_r/tramp-arm.s | 10
ffcall-1.10+2.43/callback/trampoline_r/tramp-mips.s | 12
ffcall-1.10+2.43/callback/trampoline_r/trampoline.c | 105 --
ffcall-1.10+2.43/callback/vacall_r/Makefile.in | 36
ffcall-1.10+2.43/callback/vacall_r/vacall_r.h.in | 28
ffcall-1.10+2.43/m4/general.m4 | 6
ffcall-1.10+2.43/trampoline/Makefile.in | 32
ffcall-1.10+2.43/trampoline/cache-arm.c | 16
ffcall-1.10+2.43/trampoline/cache-arm.s | 15
ffcall-1.10+2.43/trampoline/configure.in | 2
ffcall-1.10+2.43/trampoline/tramp-arm.s | 12
ffcall-1.10+2.43/trampoline/trampoline.c | 63 -
ffcall-1.10+2.43/vacall/Makefile.in | 32
ffcall-1.10+2.43/vacall/vacall.h.in | 18
23 files changed, 757 insertions(+), 737 deletions(-)
--- a/ffcall-1.10+2.43/avcall/Makefile.in
+++ b/ffcall-1.10+2.43/avcall/Makefile.in
@@ -155,34 +155,34 @@ libavcall.la : $(OBJECTS) @@ -155,34 +155,34 @@ libavcall.la : $(OBJECTS)
# Installs the library and include files only. Typically called with only # Installs the library and include files only. Typically called with only
# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
@ -55,8 +81,8 @@
uninstall : force uninstall : force
$(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libavcall.la $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libavcall.la
--- ffcall-1.10+2.43/avcall/avcall-mips.S --- a/ffcall-1.10+2.43/avcall/avcall-mips.S
+++ ffcall-1.10+2.43/avcall/avcall-mips.S 2008-02-25 14:49:16.398841723 +0100 +++ b/ffcall-1.10+2.43/avcall/avcall-mips.S
@@ -1,418 +1,406 @@ @@ -1,418 +1,406 @@
-#include "asmmips.h" -#include "asmmips.h"
.file 1 "avcall-mips.c" .file 1 "avcall-mips.c"
@ -857,8 +883,8 @@
- -
.end __builtin_avcall .end __builtin_avcall
+ .ident "GCC: (GNU) 3.3.5 (Debian 1:3.3.5-8)" + .ident "GCC: (GNU) 3.3.5 (Debian 1:3.3.5-8)"
--- ffcall-1.10+2.43/avcall/avcall-mips.c --- a/ffcall-1.10+2.43/avcall/avcall-mips.c
+++ ffcall-1.10+2.43/avcall/avcall-mips.c 2008-02-25 14:49:16.418844285 +0100 +++ b/ffcall-1.10+2.43/avcall/avcall-mips.c
@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
/** /**
Copyright 1993 Bill Triggs, <Bill.Triggs@inrialpes.fr> Copyright 1993 Bill Triggs, <Bill.Triggs@inrialpes.fr>
@ -896,7 +922,7 @@
+ float fret; + float fret;
+ double dret; + double dret;
+ +
+ /* load leading float args */ + /* load leading float args */
+ if (l->flags & __AV_FLOAT_1) + if (l->flags & __AV_FLOAT_1)
+ __asm__("l.s $f12,%1(%0)" : : "p" (l), "i" OFFSETOF(av_alist,floatarg[0])); + __asm__("l.s $f12,%1(%0)" : : "p" (l), "i" OFFSETOF(av_alist,floatarg[0]));
+ if (l->flags & __AV_DOUBLE_1) + if (l->flags & __AV_DOUBLE_1)
@ -1056,8 +1082,8 @@
} }
return 0; return 0;
} }
--- ffcall-1.10+2.43/avcall/avcall.h.in --- a/ffcall-1.10+2.43/avcall/avcall.h.in
+++ ffcall-1.10+2.43/avcall/avcall.h.in 2008-02-25 14:49:16.398841723 +0100 +++ b/ffcall-1.10+2.43/avcall/avcall.h.in
@@ -286,9 +286,11 @@ enum __AV_alist_flags @@ -286,9 +286,11 @@ enum __AV_alist_flags
#if defined(__i386__) || defined(__m68k__) || defined(__mipsn32__) || defined(__mips64__) || defined(__sparc64__) || defined(__alpha__) || defined(__arm__) || (defined(__powerpc__) && !defined(__powerpc64__)) || defined(__convex__) || defined(__ia64__) || defined(__x86_64__) || defined(__s390__) #if defined(__i386__) || defined(__m68k__) || defined(__mipsn32__) || defined(__mips64__) || defined(__sparc64__) || defined(__alpha__) || defined(__arm__) || (defined(__powerpc__) && !defined(__powerpc64__)) || defined(__convex__) || defined(__ia64__) || defined(__x86_64__) || defined(__s390__)
__AV_REGISTER_STRUCT_RETURN = 1<<9, __AV_REGISTER_STRUCT_RETURN = 1<<9,
@ -1162,8 +1188,8 @@
#define __av_struct_leftadjusted(LIST,TYPE,TYPE_SIZE,TYPE_ALIGN,ASSIGN,VAL) \ #define __av_struct_leftadjusted(LIST,TYPE,TYPE_SIZE,TYPE_ALIGN,ASSIGN,VAL) \
(((LIST).aptr = \ (((LIST).aptr = \
(__avword*)(((__avword)(LIST).aptr+(TYPE_SIZE)+(TYPE_ALIGN)-1) & -(long)(TYPE_ALIGN)))\ (__avword*)(((__avword)(LIST).aptr+(TYPE_SIZE)+(TYPE_ALIGN)-1) & -(long)(TYPE_ALIGN)))\
--- ffcall-1.10+2.43/callback/Makefile.in --- a/ffcall-1.10+2.43/callback/Makefile.in
+++ ffcall-1.10+2.43/callback/Makefile.in 2008-02-25 14:49:20.095314920 +0100 +++ b/ffcall-1.10+2.43/callback/Makefile.in
@@ -67,36 +67,36 @@ libcallback.la : vacall_r/libvacall.la t @@ -67,36 +67,36 @@ libcallback.la : vacall_r/libvacall.la t
# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
install-lib : all force install-lib : all force
@ -1221,9 +1247,9 @@
uninstall : force uninstall : force
cd @subdir@; $(MAKE) uninstall cd @subdir@; $(MAKE) uninstall
--- ffcall-1.10+2.43/callback/trampoline_r/Makefile.in --- a/ffcall-1.10+2.43/callback/trampoline_r/Makefile.in
+++ ffcall-1.10+2.43/callback/trampoline_r/Makefile.in 2008-02-25 14:49:20.119317993 +0100 +++ b/ffcall-1.10+2.43/callback/trampoline_r/Makefile.in
@@ -126,32 +126,32 @@ libtrampoline.la : $(OBJECTS) @@ -123,32 +123,32 @@ libtrampoline.la : $(OBJECTS)
# Installs the library and include files only. Typically called with only # Installs the library and include files only. Typically called with only
# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
install-lib : all force install-lib : all force
@ -1274,8 +1300,8 @@
uninstall : force uninstall : force
# $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libtrampoline.la # $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libtrampoline.la
--- ffcall-1.10+2.43/callback/trampoline_r/cache-arm.c --- /dev/null
+++ ffcall-1.10+2.43/callback/trampoline_r/cache-arm.c 2008-02-25 14:49:16.506855549 +0100 +++ b/ffcall-1.10+2.43/callback/trampoline_r/cache-arm.c
@@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
+/* Instruction cache flushing for arm */ +/* Instruction cache flushing for arm */
+ +
@ -1293,8 +1319,8 @@
+{ +{
+ asm volatile ("swi %0" : : "i" (__ARM_NR_cacheflush)); + asm volatile ("swi %0" : : "i" (__ARM_NR_cacheflush));
+} +}
--- ffcall-1.10+2.43/callback/trampoline_r/cache-arm.s --- /dev/null
+++ ffcall-1.10+2.43/callback/trampoline_r/cache-arm.s 2008-02-25 14:49:16.566863234 +0100 +++ b/ffcall-1.10+2.43/callback/trampoline_r/cache-arm.s
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
+ .file "cache-arm.c" + .file "cache-arm.c"
+ .text + .text
@ -1311,8 +1337,8 @@
+ mov pc, lr + mov pc, lr
+ .size __TR_clear_cache, .-__TR_clear_cache + .size __TR_clear_cache, .-__TR_clear_cache
+ .ident "GCC: (GNU) 3.4.0 (Debian 20040516)" + .ident "GCC: (GNU) 3.4.0 (Debian 20040516)"
--- ffcall-1.10+2.43/callback/trampoline_r/configure.in --- a/ffcall-1.10+2.43/callback/trampoline_r/configure.in
+++ ffcall-1.10+2.43/callback/trampoline_r/configure.in 2008-02-25 14:49:16.474851452 +0100 +++ b/ffcall-1.10+2.43/callback/trampoline_r/configure.in
@@ -30,7 +30,7 @@ if test ${host_cpu_abi} = powerpc; then @@ -30,7 +30,7 @@ if test ${host_cpu_abi} = powerpc; then
*) ;; *) ;;
esac esac
@ -1322,8 +1348,8 @@
CPU_OBJECTS="$CPU_OBJECTS "'cache-$(CPU).lo' CPU_OBJECTS="$CPU_OBJECTS "'cache-$(CPU).lo'
fi fi
if test ${host_cpu_abi} = powerpc; then if test ${host_cpu_abi} = powerpc; then
--- ffcall-1.10+2.43/callback/trampoline_r/tramp-arm.s --- a/ffcall-1.10+2.43/callback/trampoline_r/tramp-arm.s
+++ ffcall-1.10+2.43/callback/trampoline_r/tramp-arm.s 2008-02-25 14:49:16.598867330 +0100 +++ b/ffcall-1.10+2.43/callback/trampoline_r/tramp-arm.s
@@ -22,19 +22,15 @@ pc .req r15 @@ -22,19 +22,15 @@ pc .req r15
_tramp: _tramp:
@ Immediate constants are a problem. I take the indirect load approach @ Immediate constants are a problem. I take the indirect load approach
@ -1347,8 +1373,8 @@
_function: _function:
.word 0xbabebec0 .word 0xbabebec0
+ .global _function + .global _function
--- ffcall-1.10+2.43/callback/trampoline_r/tramp-mips.s --- a/ffcall-1.10+2.43/callback/trampoline_r/tramp-mips.s
+++ ffcall-1.10+2.43/callback/trampoline_r/tramp-mips.s 2008-02-25 14:49:16.634871936 +0100 +++ b/ffcall-1.10+2.43/callback/trampoline_r/tramp-mips.s
@@ -17,12 +17,12 @@ @@ -17,12 +17,12 @@
.globl tramp .globl tramp
.ent tramp .ent tramp
@ -1368,8 +1394,8 @@
+$LC0: .word 0x73554711 +$LC0: .word 0x73554711
+$LC1: .word 0xbabebec0 +$LC1: .word 0xbabebec0
.end tramp .end tramp
--- ffcall-1.10+2.43/callback/trampoline_r/trampoline.c --- a/ffcall-1.10+2.43/callback/trampoline_r/trampoline.c
+++ ffcall-1.10+2.43/callback/trampoline_r/trampoline.c 2008-02-25 14:49:16.538859649 +0100 +++ b/ffcall-1.10+2.43/callback/trampoline_r/trampoline.c
@@ -240,11 +240,7 @@ extern void __TR_clear_cache(); @@ -240,11 +240,7 @@ extern void __TR_clear_cache();
#define TRAMP_LENGTH 14 #define TRAMP_LENGTH 14
#define TRAMP_ALIGN 16 #define TRAMP_ALIGN 16
@ -1541,8 +1567,8 @@
#endif #endif
#if defined(__powerpc__) && !defined(__powerpc64__) #if defined(__powerpc__) && !defined(__powerpc64__)
__TR_clear_cache(function); __TR_clear_cache(function);
--- ffcall-1.10+2.43/callback/vacall_r/Makefile.in --- a/ffcall-1.10+2.43/callback/vacall_r/Makefile.in
+++ ffcall-1.10+2.43/callback/vacall_r/Makefile.in 2008-02-25 14:49:20.155322601 +0100 +++ b/ffcall-1.10+2.43/callback/vacall_r/Makefile.in
@@ -163,32 +163,32 @@ libvacall.la : $(OBJECTS) @@ -163,32 +163,32 @@ libvacall.la : $(OBJECTS)
# Installs the library and include files only. Typically called with only # Installs the library and include files only. Typically called with only
# $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
@ -1594,8 +1620,8 @@
uninstall : force uninstall : force
# $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libvacall.la # $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libvacall.la
--- ffcall-1.10+2.43/callback/vacall_r/vacall_r.h.in --- a/ffcall-1.10+2.43/callback/vacall_r/vacall_r.h.in
+++ ffcall-1.10+2.43/callback/vacall_r/vacall_r.h.in 2008-02-25 14:49:16.662875524 +0100 +++ b/ffcall-1.10+2.43/callback/vacall_r/vacall_r.h.in
@@ -288,7 +288,7 @@ enum __VA_alist_flags @@ -288,7 +288,7 @@ enum __VA_alist_flags
#if defined(__i386__) || defined(__m68k__) || defined(__mipsn32__) || defined(__mips64__) || defined(__sparc64__) || defined(__alpha__) || defined(__arm__) || (defined(__powerpc__) && !defined(__powerpc64__)) || defined(__convex__) || defined(__ia64__) || defined(__x86_64__) || defined(__s390__) #if defined(__i386__) || defined(__m68k__) || defined(__mipsn32__) || defined(__mips64__) || defined(__sparc64__) || defined(__alpha__) || defined(__arm__) || (defined(__powerpc__) && !defined(__powerpc64__)) || defined(__convex__) || defined(__ia64__) || defined(__x86_64__) || defined(__s390__)
__VA_REGISTER_STRUCT_RETURN = 1<<10, __VA_REGISTER_STRUCT_RETURN = 1<<10,
@ -1694,8 +1720,8 @@
/* small structures < 1 word are adjusted depending on compiler */ /* small structures < 1 word are adjusted depending on compiler */
#define __va_arg_struct(LIST,TYPE_SIZE,TYPE_ALIGN) \ #define __va_arg_struct(LIST,TYPE_SIZE,TYPE_ALIGN) \
(__va_align_struct(LIST,TYPE_SIZE,TYPE_ALIGN) \ (__va_align_struct(LIST,TYPE_SIZE,TYPE_ALIGN) \
--- ffcall-1.10+2.43/m4/general.m4 --- a/ffcall-1.10+2.43/m4/general.m4
+++ ffcall-1.10+2.43/m4/general.m4 2008-02-25 14:49:16.686878594 +0100 +++ b/ffcall-1.10+2.43/m4/general.m4
@@ -149,7 +149,7 @@ changequote(,)dnl @@ -149,7 +149,7 @@ changequote(,)dnl
host_cpu_instructionset=arm host_cpu_instructionset=arm
;; ;;
@ -1723,8 +1749,8 @@
AC_CACHE_CHECK([for 64-bit MIPS], cl_cv_host_mips64, [ AC_CACHE_CHECK([for 64-bit MIPS], cl_cv_host_mips64, [
AC_EGREP_CPP(yes, AC_EGREP_CPP(yes,
[#if defined(_MIPS_SZLONG) [#if defined(_MIPS_SZLONG)
--- ffcall-1.10+2.43/trampoline/Makefile.in --- a/ffcall-1.10+2.43/trampoline/Makefile.in
+++ ffcall-1.10+2.43/trampoline/Makefile.in 2008-02-25 14:49:20.179325674 +0100 +++ b/ffcall-1.10+2.43/trampoline/Makefile.in
@@ -110,28 +110,28 @@ libtrampoline.a : $(OBJECTS) @@ -110,28 +110,28 @@ libtrampoline.a : $(OBJECTS)
$(RANLIB) libtrampoline.a $(RANLIB) libtrampoline.a
@ -1770,8 +1796,8 @@
uninstall : force uninstall : force
$(RM) $(DESTDIR)$(libdir)/libtrampoline.a $(RM) $(DESTDIR)$(libdir)/libtrampoline.a
--- ffcall-1.10+2.43/trampoline/cache-arm.c --- /dev/null
+++ ffcall-1.10+2.43/trampoline/cache-arm.c 2008-02-25 14:49:16.750886790 +0100 +++ b/ffcall-1.10+2.43/trampoline/cache-arm.c
@@ -0,0 +1,16 @@ @@ -0,0 +1,16 @@
+/* Instruction cache flushing for arm */ +/* Instruction cache flushing for arm */
+ +
@ -1789,8 +1815,8 @@
+{ +{
+ asm volatile ("swi %0" : : "i" (__ARM_NR_cacheflush)); + asm volatile ("swi %0" : : "i" (__ARM_NR_cacheflush));
+} +}
--- ffcall-1.10+2.43/trampoline/cache-arm.s --- /dev/null
+++ ffcall-1.10+2.43/trampoline/cache-arm.s 2008-02-25 14:49:16.814894982 +0100 +++ b/ffcall-1.10+2.43/trampoline/cache-arm.s
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
+ .file "cache-arm.c" + .file "cache-arm.c"
+ .text + .text
@ -1807,8 +1833,8 @@
+ mov pc, lr + mov pc, lr
+ .size __TR_clear_cache, .-__TR_clear_cache + .size __TR_clear_cache, .-__TR_clear_cache
+ .ident "GCC: (GNU) 3.4.0 (Debian 20040516)" + .ident "GCC: (GNU) 3.4.0 (Debian 20040516)"
--- ffcall-1.10+2.43/trampoline/configure.in --- a/ffcall-1.10+2.43/trampoline/configure.in
+++ ffcall-1.10+2.43/trampoline/configure.in 2008-02-25 14:49:16.718882694 +0100 +++ b/ffcall-1.10+2.43/trampoline/configure.in
@@ -28,7 +28,7 @@ if test ${host_cpu_abi} = powerpc; then @@ -28,7 +28,7 @@ if test ${host_cpu_abi} = powerpc; then
*) ;; *) ;;
esac esac
@ -1818,8 +1844,8 @@
CPU_OBJECTS="$CPU_OBJECTS "'cache-$(CPU).o' CPU_OBJECTS="$CPU_OBJECTS "'cache-$(CPU).o'
fi fi
if test ${host_cpu_abi} = powerpc; then if test ${host_cpu_abi} = powerpc; then
--- ffcall-1.10+2.43/trampoline/tramp-arm.s --- a/ffcall-1.10+2.43/trampoline/tramp-arm.s
+++ ffcall-1.10+2.43/trampoline/tramp-arm.s 2008-02-25 14:49:16.850899593 +0100 +++ b/ffcall-1.10+2.43/trampoline/tramp-arm.s
@@ -23,13 +23,11 @@ _tramp: @@ -23,13 +23,11 @@ _tramp:
@ Immediate constants are a problem. I take the indirect load approach @ Immediate constants are a problem. I take the indirect load approach
@ because I don't want 4 instructions for each constant. @ because I don't want 4 instructions for each constant.
@ -1839,8 +1865,8 @@
.global _data .global _data
.align 0 .align 0
--- ffcall-1.10+2.43/trampoline/trampoline.c --- a/ffcall-1.10+2.43/trampoline/trampoline.c
+++ ffcall-1.10+2.43/trampoline/trampoline.c 2008-02-25 14:49:16.778890375 +0100 +++ b/ffcall-1.10+2.43/trampoline/trampoline.c
@@ -278,7 +278,7 @@ extern void __TR_clear_cache(); @@ -278,7 +278,7 @@ extern void __TR_clear_cache();
#define TRAMP_BIAS 2 #define TRAMP_BIAS 2
#endif #endif
@ -1934,8 +1960,8 @@
#endif #endif
#if defined(__powerpc__) && !defined(__powerpc64__) #if defined(__powerpc__) && !defined(__powerpc64__)
__TR_clear_cache(function); __TR_clear_cache(function);
--- ffcall-1.10+2.43/vacall/Makefile.in --- a/ffcall-1.10+2.43/vacall/Makefile.in
+++ ffcall-1.10+2.43/vacall/Makefile.in 2008-02-25 14:49:20.215330284 +0100 +++ b/ffcall-1.10+2.43/vacall/Makefile.in
@@ -145,28 +145,28 @@ libvacall.a : $(OBJECTS) @@ -145,28 +145,28 @@ libvacall.a : $(OBJECTS)
$(RANLIB) libvacall.a $(RANLIB) libvacall.a
@ -1981,8 +2007,8 @@
uninstall : force uninstall : force
$(RM) $(DESTDIR)$(libdir)/libvacall.a $(RM) $(DESTDIR)$(libdir)/libvacall.a
--- ffcall-1.10+2.43/vacall/vacall.h.in --- a/ffcall-1.10+2.43/vacall/vacall.h.in
+++ ffcall-1.10+2.43/vacall/vacall.h.in 2008-02-25 14:49:16.878903178 +0100 +++ b/ffcall-1.10+2.43/vacall/vacall.h.in
@@ -289,7 +289,7 @@ enum __VA_alist_flags @@ -289,7 +289,7 @@ enum __VA_alist_flags
#if defined(__i386__) || defined(__m68k__) || defined(__mipsn32__) || defined(__mips64__) || defined(__sparc64__) || defined(__alpha__) || defined(__arm__) || (defined(__powerpc__) && !defined(__powerpc64__)) || defined(__convex__) || defined(__ia64__) || defined(__x86_64__) || defined(__s390__) #if defined(__i386__) || defined(__m68k__) || defined(__mipsn32__) || defined(__mips64__) || defined(__sparc64__) || defined(__alpha__) || defined(__arm__) || (defined(__powerpc__) && !defined(__powerpc64__)) || defined(__convex__) || defined(__ia64__) || defined(__x86_64__) || defined(__s390__)
__VA_REGISTER_STRUCT_RETURN = 1<<10, __VA_REGISTER_STRUCT_RETURN = 1<<10,

17
fix-build-in-qemu.patch
View File

@ -1,7 +1,10 @@
Index: libsigsegv-2.9/tests/Makefile.am ---
=================================================================== libsigsegv-2.10/tests/Makefile.am | 2 +-
--- libsigsegv-2.9/tests/Makefile.am.orig libsigsegv-2.10/tests/Makefile.in | 1 -
+++ libsigsegv-2.9/tests/Makefile.am 2 files changed, 1 insertion(+), 2 deletions(-)
--- a/libsigsegv-2.10/tests/Makefile.am
+++ b/libsigsegv-2.10/tests/Makefile.am
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests
@ -11,10 +14,8 @@ Index: libsigsegv-2.9/tests/Makefile.am
EXTRA_DIST = mmaputil.h altstack.h EXTRA_DIST = mmaputil.h altstack.h
Index: libsigsegv-2.9/tests/Makefile.in --- a/libsigsegv-2.10/tests/Makefile.in
=================================================================== +++ b/libsigsegv-2.10/tests/Makefile.in
--- libsigsegv-2.9/tests/Makefile.in.orig
+++ libsigsegv-2.9/tests/Makefile.in
@@ -35,7 +35,6 @@ POST_UNINSTALL = : @@ -35,7 +35,6 @@ POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@

3
libsigsegv-2.10.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8460a4a3dd4954c3d96d7a4f5dd5bc4d9b76f5754196aa245287553b26d2199a
size 402279

3
libsigsegv-2.9.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea7219030b50bdb94222169e5783e658b639fd485ed6e8a9c5cd1b33ffad5206
size 397885