From d5a36a868b4b40ad8e12b5b326408d7aa98f32f5ab67e9a06a8aaa446be1b70b Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Wed, 28 Nov 2012 21:22:46 +0000 Subject: [PATCH] Accepting request 143477 from home:toganm:branches:devel:languages:misc - 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 --- clisp-2.39-clx.dif | 12 +- clisp-2.39-ia64-wooh.dif | 10 +- clisp-2.44.1-ia64.dif | 18 ++- clisp-2.44.1-map_private.patch | 10 +- clisp-2.44.1-map_variable.patch | 8 +- clisp-2.49-personality.patch | 8 +- clisp-2.49.dif | 234 +++++++++++++++++--------------- clisp-glibc-fix.patch | 31 +++++ clisp-linux.patch | 8 +- clisp.changes | 8 ++ clisp.spec | 134 +++++++++--------- ffcall-1.10+2.43.dif | 122 ++++++++++------- fix-build-in-qemu.patch | 17 +-- libsigsegv-2.10.tar.gz | 3 + libsigsegv-2.9.tar.gz | 3 - 15 files changed, 372 insertions(+), 254 deletions(-) create mode 100644 clisp-glibc-fix.patch create mode 100644 libsigsegv-2.10.tar.gz delete mode 100644 libsigsegv-2.9.tar.gz diff --git a/clisp-2.39-clx.dif b/clisp-2.39-clx.dif index 7f6509d..318c63f 100644 --- a/clisp-2.39-clx.dif +++ b/clisp-2.39-clx.dif @@ -1,6 +1,10 @@ ---- modules/clx/new-clx/clx.f -+++ modules/clx/new-clx/clx.f 2007-01-24 11:33:44.000000000 +0100 -@@ -1563,7 +1563,8 @@ static void general_lookup (object type) +--- + modules/clx/new-clx/clx.f | 6 ++++-- + 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) \ { VALUES1(make_uint29((XID)get_##c (popSTACK()))); } \ DEFUN(XLIB:##L##-EQUAL,xxx yyy) \ @@ -10,7 +14,7 @@ DEFUN(XLIB:LOOKUP-##L,display xxx) \ { 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) \ { VALUES_IF(c##_p (popSTACK())); } \ DEFUN(XLIB:##L##-EQUAL,xxx yyy) \ diff --git a/clisp-2.39-ia64-wooh.dif b/clisp-2.39-ia64-wooh.dif index 134e5be..61b8f00 100644 --- a/clisp-2.39-ia64-wooh.dif +++ b/clisp-2.39-ia64-wooh.dif @@ -1,6 +1,10 @@ ---- tests/streams.tst -+++ tests/streams.tst 2006-07-25 15:58:55.000000000 +0000 -@@ -1031,8 +1031,8 @@ T +--- + tests/streams.tst | 4 ++-- + 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))) T diff --git a/clisp-2.44.1-ia64.dif b/clisp-2.44.1-ia64.dif index 32f58d8..0124147 100644 --- a/clisp-2.44.1-ia64.dif +++ b/clisp-2.44.1-ia64.dif @@ -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 @@ .file "avcall-ia64.c" - .version "01.01" @@ -1317,8 +1323,8 @@ .endp __builtin_avcall# - .ident "GCC: (GNU) 2.9-ia64-000216 snap-000324" + .ident "GCC: (GNU) 4.1.0 (SUSE Linux)" ---- 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 +--- a/ffcall-1.10+2.43/avcall/avcall.h.in ++++ b/ffcall-1.10+2.43/avcall/avcall.h.in @@ -1112,7 +1112,7 @@ typedef struct * different alignment. */ @@ -1337,8 +1343,8 @@ /* Types larger than a word have 2-word alignment. */ #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)), \ ---- 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 +--- a/ffcall-1.10+2.43/callback/vacall_r/vacall_r.h.in ++++ b/ffcall-1.10+2.43/callback/vacall_r/vacall_r.h.in @@ -1059,7 +1059,7 @@ typedef __va_alist* va_alist; #endif #define __va_align_struct(LIST,TYPE_SIZE,TYPE_ALIGN) \ diff --git a/clisp-2.44.1-map_private.patch b/clisp-2.44.1-map_private.patch index b12a6af..7e16a75 100644 --- a/clisp-2.44.1-map_private.patch +++ b/clisp-2.44.1-map_private.patch @@ -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 -@@ -452,7 +452,7 @@ +--- + ffcall-1.10+2.43/callback/trampoline_r/trampoline.c | 2 +- + 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. */ char* page; #ifdef EXECUTABLE_VIA_MMAP_ANONYMOUS diff --git a/clisp-2.44.1-map_variable.patch b/clisp-2.44.1-map_variable.patch index d95e30b..6dcb82d 100644 --- a/clisp-2.44.1-map_variable.patch +++ b/clisp-2.44.1-map_variable.patch @@ -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 extern void* trampoline_r_data0 (void*); extern void* trampoline_r_data1 (void*); diff --git a/clisp-2.49-personality.patch b/clisp-2.49-personality.patch index 5b78233..ab361be 100644 --- a/clisp-2.49-personality.patch +++ b/clisp-2.49-personality.patch @@ -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 @@ /* Declare stderr, perror(). */ # include diff --git a/clisp-2.49.dif b/clisp-2.49.dif index 3b651f2..a7513c5 100644 --- a/clisp-2.49.dif +++ b/clisp-2.49.dif @@ -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 passnext=both ;; @@ -26,8 +44,8 @@ subdir_configure_args="$subdir_configure_args $arg" prev=host passnext=configure ;; ---- 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 +--- a/ffcall-1.10+2.43/build-aux/config.guess ++++ b/ffcall-1.10+2.43/build-aux/config.guess @@ -985,6 +985,7 @@ EOF exit ;; esac @@ -36,8 +54,8 @@ eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include ---- 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 +--- a/ffcall-1.10+2.43/callback/trampoline_r/trampoline.c ++++ b/ffcall-1.10+2.43/callback/trampoline_r/trampoline.c @@ -191,15 +191,11 @@ extern RETGETPAGESIZETYPE getpagesize (v #ifdef ultrix #include @@ -54,8 +72,8 @@ #ifdef __m88k__ #include #endif ---- modules/clx/new-clx/clx.lisp -+++ modules/clx/new-clx/clx.lisp 2008-02-25 13:00:18.000000000 +0000 +--- a/modules/clx/new-clx/clx.lisp ++++ b/modules/clx/new-clx/clx.lisp @@ -22,6 +22,7 @@ ;;;; -------------------------------------------------------------------------- ;;;; Exports @@ -64,8 +82,8 @@ (export '(*version* access-control access-error access-hosts activate-screen-saver add-access-host add-resource add-to-save-set alist alloc-color ---- modules/clx/new-clx/demos/clx-demos.lisp -+++ modules/clx/new-clx/demos/clx-demos.lisp 2010-07-14 12:49:25.000000000 +0000 +--- a/modules/clx/new-clx/demos/clx-demos.lisp ++++ b/modules/clx/new-clx/demos/clx-demos.lisp @@ -11,7 +11,7 @@ (defparameter *demos* @@ -75,8 +93,8 @@ (recurrence) (plaid) (clclock) (bball) (bwindow))) (defmacro do-demos ((fun-var) &body body) ---- modules/clx/new-clx/demos/koch.lisp -+++ modules/clx/new-clx/demos/koch.lisp 2008-02-25 13:00:18.000000000 +0000 +--- a/modules/clx/new-clx/demos/koch.lisp ++++ b/modules/clx/new-clx/demos/koch.lisp @@ -7,7 +7,30 @@ ;;; $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 $ @@ -88,7 +106,7 @@ + (:shadowing-import-from "XLIB" "CHAR-WIDTH") ; EXT has CHAR-WIDTH + (:export "KOCH")) + -+(in-package :koch) ++(in-package :koch) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defun x-host-display (&optional (disp (getenv "DISPLAY"))) + "Parse the DISPLAY environment variable. @@ -118,8 +136,8 @@ +~% Call (koch:koch)~%~%") + (provide "koch") ---- modules/clx/new-clx/demos/qix.lisp -+++ modules/clx/new-clx/demos/qix.lisp 2008-02-25 13:00:18.000000000 +0000 +--- a/modules/clx/new-clx/demos/qix.lisp ++++ b/modules/clx/new-clx/demos/qix.lisp @@ -14,7 +14,30 @@ ;;;; o or a spline option?! ;;;; @@ -162,8 +180,8 @@ +~% Call (qix:qix) or (qix:qix :delay 0)~%~%") + (provide "qix") ---- modules/clx/new-clx/demos/sokoban.lisp -+++ modules/clx/new-clx/demos/sokoban.lisp 2008-02-25 13:00:18.000000000 +0000 +--- a/modules/clx/new-clx/demos/sokoban.lisp ++++ b/modules/clx/new-clx/demos/sokoban.lisp @@ -41,7 +41,30 @@ ;;;; - maximum field size is hard wired to 20x20. (This is not in the LISP spirit!) ;;;; - sometimes the programm could not count correctly ... @@ -217,8 +235,8 @@ +(format t "~&~% Call (sokoban:sokoban)~%~%") + (provide "sokoban") ---- modules/postgresql/link.sh.in -+++ modules/postgresql/link.sh.in 2008-02-25 13:00:18.000000000 +0000 +--- a/modules/postgresql/link.sh.in ++++ b/modules/postgresql/link.sh.in @@ -4,5 +4,5 @@ ${MAKE-make} clisp-module \ NEW_MODULES='postgresql' NEW_FILES='' @@ -226,8 +244,8 @@ -NEW_LIBS="${NEW_FILES} @LIBS@" +NEW_LIBS="${NEW_FILES} @LIBS@ -lcrypt -lssl" TO_LOAD='postgresql sql' ---- src/aclocal.m4 -+++ src/aclocal.m4 2008-02-25 13:00:18.000000000 +0000 +--- a/src/aclocal.m4 ++++ b/src/aclocal.m4 @@ -6668,7 +6668,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], dnl When using libtool, the option that works for both libraries and dnl executables is -R. The -R options are cumulative. @@ -237,89 +255,8 @@ done fi popdef([P_A_C_K]) ---- src/lispbibl.d -+++ src/lispbibl.d 2010-07-14 12:53:05.000000000 +0000 -@@ -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 - #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 +--- a/src/build-aux/config.guess ++++ b/src/build-aux/config.guess @@ -870,29 +870,29 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 @@ -446,8 +383,89 @@ exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. ---- utils/gctrigger.c -+++ utils/gctrigger.c 2008-02-25 13:00:18.000000000 +0000 +--- a/src/lispbibl.d ++++ 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 + #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 static Token nexttoken (boolean within_prep_directive) { @@ -456,8 +474,8 @@ restart: { int c = next_char(); switch (c) { ---- utils/modprep.lisp -+++ utils/modprep.lisp 2008-02-25 13:00:18.000000000 +0000 +--- a/utils/modprep.lisp ++++ b/utils/modprep.lisp @@ -345,7 +345,7 @@ FOO(bar,baz,zot) ==> FOO; (bar baz zot); ((or (char= cc #\_) (char= cc #\-)) (write-char #\_ out)) (t (format out "_~2,'0x" (char-code cc)))))) diff --git a/clisp-glibc-fix.patch b/clisp-glibc-fix.patch new file mode 100644 index 0000000..f765a8b --- /dev/null +++ b/clisp-glibc-fix.patch @@ -0,0 +1,31 @@ +From: Togan Muftuoglu +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 @@ + ; =========================== =================================== + + (c-lines "#include ~%") +- + ; --------------------------- ----------------------------------- + + (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) diff --git a/clisp-linux.patch b/clisp-linux.patch index 86a3306..adf871a 100644 --- a/clisp-linux.patch +++ b/clisp-linux.patch @@ -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 @@ (def-c-type __key_t) ; int diff --git a/clisp.changes b/clisp.changes index ea67cff..5a6ae58 100644 --- a/clisp.changes +++ b/clisp.changes @@ -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 diff --git a/clisp.spec b/clisp.spec index 0cc6ac1..dbe07ad 100644 --- a/clisp.spec +++ b/clisp.spec @@ -38,7 +38,7 @@ BuildRequires: xorg-x11-devel # gcc-c++ # to BuildRequires # -%define debug no +%define debug no Requires(pre): vim Version: 2.49 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 # adopted to work with clisp-2.43 and higher 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 Source4: README.SuSE Patch0: clisp-2.49.dif @@ -63,9 +63,10 @@ Patch8: clisp-2.39-clx.dif Patch10: ffcall-1.10+2.43.dif Patch11: fix-build-in-qemu.patch Patch12: clisp-linux.patch +Patch13: clisp-glibc-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global vimdir %{_datadir}/vim/site/after/syntax -%global xarch ppc64 s390x armv4l +%global xarch ppc64 s390x armv4l ExcludeArch: ppc64 s390x armv4l %description @@ -96,19 +97,22 @@ contains two nice applications. %prep %setup -qT -b0 -a1 -a2 -%patch1 -p0 -b .mappriv -%patch2 -p0 -b .mapvar -%patch3 -p0 -b .sel -%patch4 -p0 -b .ia64 -%patch7 -p0 -b .wooh -%patch8 -p0 -b .clx -%patch10 -p0 -b .ffcall -%patch0 +%patch1 -p1 -b .mappriv +%patch2 -p1 -b .mapvar +%patch3 -p1 -b .sel +%patch4 -p1 -b .ia64 +%patch7 -p1 -b .wooh +%patch8 -p1 -b .clx +%patch10 -p1 -b .ffcall +%patch0 -p1 %if 0%{?qemu_user_space_build:1} # 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 -%patch12 -p0 %build # @@ -135,15 +139,15 @@ else fi CC="${CC} -g ${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -pipe" case "$RPM_ARCH" in - i[0-9]86) CC="${CC} -falign-functions=4 -mieee-fp -ffloat-store" ;; - ppc) CC="${CC}" ;; - s390) CC="${CC}" ;; - x86_64) CC="${CC} -fno-gcse" ;; - sparc*) CC="${CC} -fno-gcse" ;; - ppc64) CC="${CC} -fno-gcse -mpowerpc64" ;; - s390x) CC="${CC} -fno-gcse" ;; - ia64) CC="${CC} -fno-gcse" ;; - axp|alpha) CC="${CC}" ;; + i[0-9]86) CC="${CC} -falign-functions=4 -mieee-fp -ffloat-store" ;; + ppc) CC="${CC}" ;; + s390) CC="${CC}" ;; + x86_64) CC="${CC} -fno-gcse" ;; + sparc*) CC="${CC} -fno-gcse" ;; + ppc64) CC="${CC} -fno-gcse -mpowerpc64" ;; + s390x) CC="${CC} -fno-gcse" ;; + ia64) CC="${CC} -fno-gcse" ;; + axp|alpha) CC="${CC}" ;; esac noexec='-DLINUX_NOEXEC_HEAPCODES' 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_GNU_SOURCE -Wno-unused -Wno-uninitialized" case "$RPM_ARCH" in - i[0-9]86) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; - ppc) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; - s390) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; - x86_64) MYCFLAGS="${MYCFLAGS} ${safety}" ;; - sparc*) MYCFLAGS="${MYCFLAGS} ${safety}" ;; - ppc64) MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD" ;; - s390x) MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD" ;; - ia64) MYCFLAGS="${MYCFLAGS} ${safety}" ;; - axp|alpha) MYCFLAGS="${MYCFLAGS} ${nommap}" ;; + i[0-9]86) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; + ppc) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; + s390) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; + x86_64) MYCFLAGS="${MYCFLAGS} ${safety}" ;; + sparc*) MYCFLAGS="${MYCFLAGS} ${safety}" ;; + ppc64) MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD" ;; + s390x) MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD" ;; + ia64) MYCFLAGS="${MYCFLAGS} ${safety}" ;; + axp|alpha) MYCFLAGS="${MYCFLAGS} ${nommap}" ;; esac export CC export MYCFLAGS @@ -192,8 +196,8 @@ unset CFLAGS SEGV=${PWD}/libsigsegv pushd libsigsegv-*/ ./configure --build ${SYSTEM} ${DEBUG}\ - --prefix=%{_prefix} \ - --libdir=%{_libdir} + --prefix=%{_prefix} \ + --libdir=%{_libdir} make make check make DESTDIR=${SEGV} install @@ -206,8 +210,8 @@ SEGV=${SEGV}/usr FFCALL=${PWD}/ffcall pushd ffcall-* ./configure --build ${SYSTEM} ${DEBUG}\ - --prefix=%{_prefix} \ - --libdir=%{_libdir} + --prefix=%{_prefix} \ + --libdir=%{_libdir} make -C avcall make -C callback make -C avcall check @@ -225,35 +229,35 @@ find -name configure | xargs -r \ # The modules i18n, syscalls, regexp # are part of the base clisp system. # -./configure --build ${SYSTEM} ${DEBUG} \ - --prefix=%{_prefix} \ - --exec-prefix=%{_prefix} \ - --libdir=%{_libdir} \ - --vimdir=%{vimdir} \ - --fsstnd=suse \ - --with-readline \ - --with-libsigsegv-prefix=${SEGV}\ +./configure --build ${SYSTEM} ${DEBUG} \ + --prefix=%{_prefix} \ + --exec-prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --vimdir=%{vimdir} \ + --fsstnd=suse \ + --with-readline \ + --with-libsigsegv-prefix=${SEGV}\ %ifnarch %xarch - --with-libffcall-prefix=${FFCALL}\ + --with-libffcall-prefix=${FFCALL}\ %else - --without-ffcall \ + --without-ffcall \ %endif - --with-dynamic-modules \ - --with-gettext \ + --with-dynamic-modules \ + --with-gettext \ %if 0%{?suse_version} >= %min_suse_ver - --with-module=dbus \ + --with-module=dbus \ %endif - --with-module=queens \ - --with-module=gdbm \ - --with-module=gtk2 \ - --with-module=pcre \ - --with-module=rawsock \ - --with-module=zlib \ - --with-module=wildcard \ - --with-module=bindings/glibc \ - --with-module=clx/new-clx \ - --with-module=berkeley-db \ - --with-module=postgresql + --with-module=queens \ + --with-module=gdbm \ + --with-module=gtk2 \ + --with-module=pcre \ + --with-module=rawsock \ + --with-module=zlib \ + --with-module=wildcard \ + --with-module=bindings/glibc \ + --with-module=clx/new-clx \ + --with-module=berkeley-db \ + --with-module=postgresql pushd src/ make make check @@ -281,12 +285,12 @@ CLXLIB=${LSPLIB}/full # Install the current system # pushd src/ - make install prefix=%{_prefix} \ - exec_prefix=%{_prefix} \ - mandir=%{_mandir} \ - libdir=%{_libdir} \ - DESTDIR=%{buildroot} \ - INSTALL_DATA='install -cm 0444' + make install prefix=%{_prefix} \ + exec_prefix=%{_prefix} \ + mandir=%{_mandir} \ + libdir=%{_libdir} \ + DESTDIR=%{buildroot} \ + INSTALL_DATA='install -cm 0444' popd # # The CLX interface diff --git a/ffcall-1.10+2.43.dif b/ffcall-1.10+2.43.dif index 02bc9a4..86452f3 100644 --- a/ffcall-1.10+2.43.dif +++ b/ffcall-1.10+2.43.dif @@ -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) # Installs the library and include files only. Typically called with only # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. @@ -55,8 +81,8 @@ uninstall : force $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libavcall.la ---- 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 +--- a/ffcall-1.10+2.43/avcall/avcall-mips.S ++++ b/ffcall-1.10+2.43/avcall/avcall-mips.S @@ -1,418 +1,406 @@ -#include "asmmips.h" .file 1 "avcall-mips.c" @@ -857,8 +883,8 @@ - .end __builtin_avcall + .ident "GCC: (GNU) 3.3.5 (Debian 1:3.3.5-8)" ---- 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 +--- a/ffcall-1.10+2.43/avcall/avcall-mips.c ++++ b/ffcall-1.10+2.43/avcall/avcall-mips.c @@ -3,6 +3,7 @@ /** Copyright 1993 Bill Triggs, @@ -896,7 +922,7 @@ + float fret; + double dret; + -+ /* load leading float args */ ++ /* load leading float args */ + if (l->flags & __AV_FLOAT_1) + __asm__("l.s $f12,%1(%0)" : : "p" (l), "i" OFFSETOF(av_alist,floatarg[0])); + if (l->flags & __AV_DOUBLE_1) @@ -1056,8 +1082,8 @@ } return 0; } ---- 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 +--- a/ffcall-1.10+2.43/avcall/avcall.h.in ++++ b/ffcall-1.10+2.43/avcall/avcall.h.in @@ -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__) __AV_REGISTER_STRUCT_RETURN = 1<<9, @@ -1162,8 +1188,8 @@ #define __av_struct_leftadjusted(LIST,TYPE,TYPE_SIZE,TYPE_ALIGN,ASSIGN,VAL) \ (((LIST).aptr = \ (__avword*)(((__avword)(LIST).aptr+(TYPE_SIZE)+(TYPE_ALIGN)-1) & -(long)(TYPE_ALIGN)))\ ---- ffcall-1.10+2.43/callback/Makefile.in -+++ ffcall-1.10+2.43/callback/Makefile.in 2008-02-25 14:49:20.095314920 +0100 +--- a/ffcall-1.10+2.43/callback/Makefile.in ++++ b/ffcall-1.10+2.43/callback/Makefile.in @@ -67,36 +67,36 @@ libcallback.la : vacall_r/libvacall.la t # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. install-lib : all force @@ -1221,9 +1247,9 @@ uninstall : force cd @subdir@; $(MAKE) uninstall ---- 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 -@@ -126,32 +126,32 @@ libtrampoline.la : $(OBJECTS) +--- a/ffcall-1.10+2.43/callback/trampoline_r/Makefile.in ++++ b/ffcall-1.10+2.43/callback/trampoline_r/Makefile.in +@@ -123,32 +123,32 @@ libtrampoline.la : $(OBJECTS) # Installs the library and include files only. Typically called with only # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. install-lib : all force @@ -1274,8 +1300,8 @@ uninstall : force # $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libtrampoline.la ---- ffcall-1.10+2.43/callback/trampoline_r/cache-arm.c -+++ ffcall-1.10+2.43/callback/trampoline_r/cache-arm.c 2008-02-25 14:49:16.506855549 +0100 +--- /dev/null ++++ b/ffcall-1.10+2.43/callback/trampoline_r/cache-arm.c @@ -0,0 +1,16 @@ +/* Instruction cache flushing for arm */ + @@ -1293,8 +1319,8 @@ +{ + asm volatile ("swi %0" : : "i" (__ARM_NR_cacheflush)); +} ---- ffcall-1.10+2.43/callback/trampoline_r/cache-arm.s -+++ ffcall-1.10+2.43/callback/trampoline_r/cache-arm.s 2008-02-25 14:49:16.566863234 +0100 +--- /dev/null ++++ b/ffcall-1.10+2.43/callback/trampoline_r/cache-arm.s @@ -0,0 +1,15 @@ + .file "cache-arm.c" + .text @@ -1311,8 +1337,8 @@ + mov pc, lr + .size __TR_clear_cache, .-__TR_clear_cache + .ident "GCC: (GNU) 3.4.0 (Debian 20040516)" ---- 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 +--- a/ffcall-1.10+2.43/callback/trampoline_r/configure.in ++++ b/ffcall-1.10+2.43/callback/trampoline_r/configure.in @@ -30,7 +30,7 @@ if test ${host_cpu_abi} = powerpc; then *) ;; esac @@ -1322,8 +1348,8 @@ CPU_OBJECTS="$CPU_OBJECTS "'cache-$(CPU).lo' fi if test ${host_cpu_abi} = powerpc; then ---- 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 +--- a/ffcall-1.10+2.43/callback/trampoline_r/tramp-arm.s ++++ b/ffcall-1.10+2.43/callback/trampoline_r/tramp-arm.s @@ -22,19 +22,15 @@ pc .req r15 _tramp: @ Immediate constants are a problem. I take the indirect load approach @@ -1347,8 +1373,8 @@ _function: .word 0xbabebec0 + .global _function ---- 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 +--- a/ffcall-1.10+2.43/callback/trampoline_r/tramp-mips.s ++++ b/ffcall-1.10+2.43/callback/trampoline_r/tramp-mips.s @@ -17,12 +17,12 @@ .globl tramp .ent tramp @@ -1368,8 +1394,8 @@ +$LC0: .word 0x73554711 +$LC1: .word 0xbabebec0 .end tramp ---- 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 +--- a/ffcall-1.10+2.43/callback/trampoline_r/trampoline.c ++++ b/ffcall-1.10+2.43/callback/trampoline_r/trampoline.c @@ -240,11 +240,7 @@ extern void __TR_clear_cache(); #define TRAMP_LENGTH 14 #define TRAMP_ALIGN 16 @@ -1541,8 +1567,8 @@ #endif #if defined(__powerpc__) && !defined(__powerpc64__) __TR_clear_cache(function); ---- 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 +--- a/ffcall-1.10+2.43/callback/vacall_r/Makefile.in ++++ b/ffcall-1.10+2.43/callback/vacall_r/Makefile.in @@ -163,32 +163,32 @@ libvacall.la : $(OBJECTS) # Installs the library and include files only. Typically called with only # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here. @@ -1594,8 +1620,8 @@ uninstall : force # $(LIBTOOL_UNINSTALL) $(RM) $(DESTDIR)$(libdir)/libvacall.la ---- 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 +--- a/ffcall-1.10+2.43/callback/vacall_r/vacall_r.h.in ++++ b/ffcall-1.10+2.43/callback/vacall_r/vacall_r.h.in @@ -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__) __VA_REGISTER_STRUCT_RETURN = 1<<10, @@ -1694,8 +1720,8 @@ /* small structures < 1 word are adjusted depending on compiler */ #define __va_arg_struct(LIST,TYPE_SIZE,TYPE_ALIGN) \ (__va_align_struct(LIST,TYPE_SIZE,TYPE_ALIGN) \ ---- ffcall-1.10+2.43/m4/general.m4 -+++ ffcall-1.10+2.43/m4/general.m4 2008-02-25 14:49:16.686878594 +0100 +--- a/ffcall-1.10+2.43/m4/general.m4 ++++ b/ffcall-1.10+2.43/m4/general.m4 @@ -149,7 +149,7 @@ changequote(,)dnl host_cpu_instructionset=arm ;; @@ -1723,8 +1749,8 @@ AC_CACHE_CHECK([for 64-bit MIPS], cl_cv_host_mips64, [ AC_EGREP_CPP(yes, [#if defined(_MIPS_SZLONG) ---- ffcall-1.10+2.43/trampoline/Makefile.in -+++ ffcall-1.10+2.43/trampoline/Makefile.in 2008-02-25 14:49:20.179325674 +0100 +--- a/ffcall-1.10+2.43/trampoline/Makefile.in ++++ b/ffcall-1.10+2.43/trampoline/Makefile.in @@ -110,28 +110,28 @@ libtrampoline.a : $(OBJECTS) $(RANLIB) libtrampoline.a @@ -1770,8 +1796,8 @@ uninstall : force $(RM) $(DESTDIR)$(libdir)/libtrampoline.a ---- ffcall-1.10+2.43/trampoline/cache-arm.c -+++ ffcall-1.10+2.43/trampoline/cache-arm.c 2008-02-25 14:49:16.750886790 +0100 +--- /dev/null ++++ b/ffcall-1.10+2.43/trampoline/cache-arm.c @@ -0,0 +1,16 @@ +/* Instruction cache flushing for arm */ + @@ -1789,8 +1815,8 @@ +{ + asm volatile ("swi %0" : : "i" (__ARM_NR_cacheflush)); +} ---- ffcall-1.10+2.43/trampoline/cache-arm.s -+++ ffcall-1.10+2.43/trampoline/cache-arm.s 2008-02-25 14:49:16.814894982 +0100 +--- /dev/null ++++ b/ffcall-1.10+2.43/trampoline/cache-arm.s @@ -0,0 +1,15 @@ + .file "cache-arm.c" + .text @@ -1807,8 +1833,8 @@ + mov pc, lr + .size __TR_clear_cache, .-__TR_clear_cache + .ident "GCC: (GNU) 3.4.0 (Debian 20040516)" ---- ffcall-1.10+2.43/trampoline/configure.in -+++ ffcall-1.10+2.43/trampoline/configure.in 2008-02-25 14:49:16.718882694 +0100 +--- a/ffcall-1.10+2.43/trampoline/configure.in ++++ b/ffcall-1.10+2.43/trampoline/configure.in @@ -28,7 +28,7 @@ if test ${host_cpu_abi} = powerpc; then *) ;; esac @@ -1818,8 +1844,8 @@ CPU_OBJECTS="$CPU_OBJECTS "'cache-$(CPU).o' fi if test ${host_cpu_abi} = powerpc; then ---- 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 +--- a/ffcall-1.10+2.43/trampoline/tramp-arm.s ++++ b/ffcall-1.10+2.43/trampoline/tramp-arm.s @@ -23,13 +23,11 @@ _tramp: @ Immediate constants are a problem. I take the indirect load approach @ because I don't want 4 instructions for each constant. @@ -1839,8 +1865,8 @@ .global _data .align 0 ---- ffcall-1.10+2.43/trampoline/trampoline.c -+++ ffcall-1.10+2.43/trampoline/trampoline.c 2008-02-25 14:49:16.778890375 +0100 +--- a/ffcall-1.10+2.43/trampoline/trampoline.c ++++ b/ffcall-1.10+2.43/trampoline/trampoline.c @@ -278,7 +278,7 @@ extern void __TR_clear_cache(); #define TRAMP_BIAS 2 #endif @@ -1934,8 +1960,8 @@ #endif #if defined(__powerpc__) && !defined(__powerpc64__) __TR_clear_cache(function); ---- ffcall-1.10+2.43/vacall/Makefile.in -+++ ffcall-1.10+2.43/vacall/Makefile.in 2008-02-25 14:49:20.215330284 +0100 +--- a/ffcall-1.10+2.43/vacall/Makefile.in ++++ b/ffcall-1.10+2.43/vacall/Makefile.in @@ -145,28 +145,28 @@ libvacall.a : $(OBJECTS) $(RANLIB) libvacall.a @@ -1981,8 +2007,8 @@ uninstall : force $(RM) $(DESTDIR)$(libdir)/libvacall.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 +--- a/ffcall-1.10+2.43/vacall/vacall.h.in ++++ b/ffcall-1.10+2.43/vacall/vacall.h.in @@ -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__) __VA_REGISTER_STRUCT_RETURN = 1<<10, diff --git a/fix-build-in-qemu.patch b/fix-build-in-qemu.patch index 47b95d2..3d0b9e6 100644 --- a/fix-build-in-qemu.patch +++ b/fix-build-in-qemu.patch @@ -1,7 +1,10 @@ -Index: libsigsegv-2.9/tests/Makefile.am -=================================================================== ---- libsigsegv-2.9/tests/Makefile.am.orig -+++ libsigsegv-2.9/tests/Makefile.am +--- + libsigsegv-2.10/tests/Makefile.am | 2 +- + libsigsegv-2.10/tests/Makefile.in | 1 - + 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 @@ 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 -Index: libsigsegv-2.9/tests/Makefile.in -=================================================================== ---- libsigsegv-2.9/tests/Makefile.in.orig -+++ libsigsegv-2.9/tests/Makefile.in +--- a/libsigsegv-2.10/tests/Makefile.in ++++ b/libsigsegv-2.10/tests/Makefile.in @@ -35,7 +35,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ diff --git a/libsigsegv-2.10.tar.gz b/libsigsegv-2.10.tar.gz new file mode 100644 index 0000000..c166a7d --- /dev/null +++ b/libsigsegv-2.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8460a4a3dd4954c3d96d7a4f5dd5bc4d9b76f5754196aa245287553b26d2199a +size 402279 diff --git a/libsigsegv-2.9.tar.gz b/libsigsegv-2.9.tar.gz deleted file mode 100644 index 88aa3e5..0000000 --- a/libsigsegv-2.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea7219030b50bdb94222169e5783e658b639fd485ed6e8a9c5cd1b33ffad5206 -size 397885