From aa04f7c8e10441449186ee22194baceee65f6df76c2b234ce48ab36e3502b8ac Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 29 Nov 2016 13:49:37 +0000 Subject: [PATCH] Test update to hg source code from 2016/11/28 OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/clisp?expand=0&rev=53 --- clisp-2.39-clx.dif | 9 ++++- clisp-2.39-ia64-wooh.dif | 2 +- clisp-2.49-clx_demos.dif | 17 ++++++--- clisp-2.49-configure.dif | 46 +++++++++++++--------- clisp-2.49-personality.patch | 8 ++-- clisp-2.49-rpath.dif | 6 ++- clisp-2.49.tar.bz2 | 3 -- clisp-536a48a9.tar.bz2 | 3 ++ clisp-db6.diff | 45 +++++++--------------- clisp-glibc-fix.patch | 31 --------------- clisp-hostname.patch | 74 ------------------------------------ clisp-link.dif | 15 ++++++++ clisp-linux.patch | 15 ++------ clisp.changes | 20 ++++++++++ clisp.spec | 37 +++++++++--------- 15 files changed, 128 insertions(+), 203 deletions(-) delete mode 100644 clisp-2.49.tar.bz2 create mode 100644 clisp-536a48a9.tar.bz2 delete mode 100644 clisp-glibc-fix.patch delete mode 100644 clisp-hostname.patch create mode 100644 clisp-link.dif diff --git a/clisp-2.39-clx.dif b/clisp-2.39-clx.dif index fec3078..bb3a4af 100644 --- a/clisp-2.39-clx.dif +++ b/clisp-2.39-clx.dif @@ -1,6 +1,11 @@ +--- + modules/clx/new-clx/clx.f | 6 ++++-- + modules/clx/new-clx/clx.lisp | 1 + + 2 files changed, 5 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) +@@ -1723,7 +1723,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 +15,7 @@ DEFUN(XLIB:LOOKUP-##L,display xxx) \ { general_lookup (`XLIB::##L##`); } -@@ -1738,7 +1739,8 @@ static void general_lookup (object type) +@@ -1740,7 +1741,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 61b8f00..d80f275 100644 --- a/clisp-2.39-ia64-wooh.dif +++ b/clisp-2.39-ia64-wooh.dif @@ -13,5 +13,5 @@ +;(stringp (with-output-to-string (s) (describe nil s))) +;T - ;; https://sourceforge.net/tracker/index.php?func=detail&aid=1622642&group_id=1355&atid=101355 + ;; https://sourceforge.net/p/clisp/bugs/396/ (let ((s "a b")) diff --git a/clisp-2.49-clx_demos.dif b/clisp-2.49-clx_demos.dif index f0eedbd..8fcf4ae 100644 --- a/clisp-2.49-clx_demos.dif +++ b/clisp-2.49-clx_demos.dif @@ -1,6 +1,13 @@ +--- + 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 +++++++++++++++++++++++++++++-- + 4 files changed, 90 insertions(+), 5 deletions(-) + --- a/modules/clx/new-clx/demos/clx-demos.lisp +++ b/modules/clx/new-clx/demos/clx-demos.lisp -@@ -11,7 +11,7 @@ +@@ -13,7 +13,7 @@ (defparameter *demos* ;; (demo-name [package requirements]) @@ -11,9 +18,9 @@ (defmacro do-demos ((fun-var) &body body) --- 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 $ +@@ -5,7 +5,30 @@ + ;;; See http://www.gnu.org/copyleft/gpl.html + ;;; -(in-package :clx-demos) +(defpackage "KOCH" @@ -43,7 +50,7 @@ (defun koch-point (cx width/2 height/2 scale) (list (round (+ width/2 (* scale width/2 (realpart cx)))) -@@ -123,4 +146,8 @@ Returns the new list and an indicator of +@@ -121,4 +144,8 @@ Returns the new list and an indicator of (xlib:unmap-window win) (xlib:display-finish-output dpy)))) diff --git a/clisp-2.49-configure.dif b/clisp-2.49-configure.dif index ed457e1..acbbdfd 100644 --- a/clisp-2.49-configure.dif +++ b/clisp-2.49-configure.dif @@ -1,6 +1,13 @@ +--- + configure | 4 ++-- + src/lispbibl.d | 16 +++++++++++----- + src/makemake.in | 10 +++++++++- + utils/modprep.lisp | 2 +- + 4 files changed, 23 insertions(+), 9 deletions(-) + --- a/configure +++ b/configure -@@ -393,11 +393,11 @@ do +@@ -392,11 +392,11 @@ do passnext=both ;; --vimdir=* | --vimdi=* | --vimd=* | --vim=* | --vi=*) @@ -16,16 +23,16 @@ passnext=both ;; --- a/src/lispbibl.d +++ b/src/lispbibl.d -@@ -121,7 +121,7 @@ +@@ -66,7 +66,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__))) +- #if (defined(unix) && (defined(linux) || defined(__CYGWIN__) || 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(__CYGWIN__) || 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 @@ +@@ -167,8 +167,14 @@ #endif #ifdef GENERIC_UNIX #define UNIX @@ -41,7 +48,7 @@ #endif #ifdef __GNU__ #define UNIX_HURD /* the GNU system (Hurd + glibc) */ -@@ -1245,7 +1251,7 @@ typedef signed int signean; +@@ -1110,7 +1116,7 @@ typedef signed int signean; address of its component 'ident' and return it as number: */ #include #ifndef offsetof @@ -50,7 +57,7 @@ #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) +@@ -3148,9 +3154,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 @@ -64,7 +71,7 @@ #define type_data_object(type,data) \ --- a/src/makemake.in +++ b/src/makemake.in -@@ -228,6 +228,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false} +@@ -246,6 +246,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false} # Handle --with-... arguments while test -z "$endofargs"; do case "$1" in @@ -74,7 +81,7 @@ -verb* | --verb* ) verbose=`echol "$1"|sed 's/-*v[^=]*=*//'` test -n "${verbose}" || verbose=true -@@ -1335,6 +1338,10 @@ if [ $XCC_GCC = true ] ; then +@@ -1272,6 +1275,10 @@ if [ $XCC_GCC = true ] ; then XCFLAGS=${XCFLAGS}" -pthread" fi @@ -85,19 +92,20 @@ 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/*' +@@ -3417,8 +3424,9 @@ if [ $CROSS = false ] ; then + echol + if [ "${with_dynamic_modules}" != no ]; then + depends="full install-modules force" +- line='linkkit base' ++ line='linkkit base full' + echol "install-modules : full force" + echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/full" -+ line='linkkit/* base/* full/*' - else - echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/full" - line='linkkit/* base/* full/*' + echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/dynmod" + echotab "DESTDIR=\`cd \"\$(DESTDIR)\$(lisplibdir)\"; pwd\` CLISP='./clisp -q -norc' ./clisp-link install \$(MODULES)" + echol --- a/utils/modprep.lisp +++ b/utils/modprep.lisp -@@ -345,7 +345,7 @@ FOO(bar,baz,zot) ==> FOO; (bar baz zot); +@@ -327,7 +327,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-2.49-personality.patch b/clisp-2.49-personality.patch index ab361be..baae881 100644 --- a/clisp-2.49-personality.patch +++ b/clisp-2.49-personality.patch @@ -4,7 +4,7 @@ --- a/src/_clisp.c +++ b/src/_clisp.c -@@ -46,6 +46,11 @@ +@@ -48,6 +48,11 @@ /* Declare stderr, perror(). */ # include @@ -16,16 +16,16 @@ #if defined(WIN32_NATIVE) # include int shell_quote (char * dest, const char * source); -@@ -417,6 +422,12 @@ int main (int argc, char* argv[]) - return 1; +@@ -429,6 +434,12 @@ int main (int argc, char* argv[]) } + #undef W32ERR #else +#if defined(HAS_PERSONALITY) && (HAS_PERSONALITY > 0) + if (personality(PER_LINUX32)) { + perror(program_name); + return 1; + } -+#endif /* FEDORA */ ++#endif execv(executable,new_argv); { /* execv() returns only if there was an error. */ int saved_errno = errno; diff --git a/clisp-2.49-rpath.dif b/clisp-2.49-rpath.dif index 56e3bb5..668a2a9 100644 --- a/clisp-2.49-rpath.dif +++ b/clisp-2.49-rpath.dif @@ -1,6 +1,10 @@ +--- + src/aclocal.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + --- a/src/aclocal.m4 +++ b/src/aclocal.m4 -@@ -6668,7 +6668,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], +@@ -6133,7 +6133,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. for found_dir in $ltrpathdirs; do diff --git a/clisp-2.49.tar.bz2 b/clisp-2.49.tar.bz2 deleted file mode 100644 index f6e4582..0000000 --- a/clisp-2.49.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8132ff353afaa70e6b19367a25ae3d5a43627279c25647c220641fed00f8e890 -size 8091011 diff --git a/clisp-536a48a9.tar.bz2 b/clisp-536a48a9.tar.bz2 new file mode 100644 index 0000000..41837ec --- /dev/null +++ b/clisp-536a48a9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16eadeffd644df4ef5a345a8c99c0906f21621f6410ad0bfeb74d1a4a1c1d07c +size 8316374 diff --git a/clisp-db6.diff b/clisp-db6.diff index ae2ab33..6dce26f 100644 --- a/clisp-db6.diff +++ b/clisp-db6.diff @@ -7,14 +7,12 @@ BDB has removed RPC support (which was not implemented anyway; it [set_rpc_server] always returned EOPNOTSUPP even in libdb-4.8). --- - modules/berkeley-db/bdb.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) + clisp-536a48a9/modules/berkeley-db/bdb.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -Index: clisp-2.49/modules/berkeley-db/bdb.c -=================================================================== ---- clisp-2.49.orig/modules/berkeley-db/bdb.c -+++ clisp-2.49/modules/berkeley-db/bdb.c -@@ -64,6 +64,7 @@ static void vecout (unsigned char* v, in +--- clisp-536a48a9/modules/berkeley-db/bdb.c ++++ clisp-536a48a9/modules/berkeley-db/bdb.c 2016-11-29 11:58:23.833524665 +0000 +@@ -60,6 +60,7 @@ static void vecout (unsigned char* v, in this is a macro and not a function for NO_UNICODE */ #define asciz_to_string0(a,e) (a ? asciz_to_string(a,e) : NIL) @@ -22,27 +20,12 @@ Index: clisp-2.49/modules/berkeley-db/bdb.c #include /* http://www.oracle.com/technology/products/berkeley-db/db/update/4.4.20/if.4.4.20.html -@@ -358,9 +359,14 @@ DEFUN(BDB:DBE-CREATE,&key PASSWORD ENCRY - # elif defined(DB_CLIENT) /* 4.1 and before */ - SYSCALL(db_env_create,(&dbe,remote_p ? DB_CLIENT : 0)); - # else --# error how does your Berkeley DB create a remote client? -+ SYSCALL(db_env_create,(&dbe,0)); - # endif -+ - if (remote_p) { -+#if !defined(DB_RPCCLIENT) && !defined(DB_CLIENT) -+# warning No BDB RPC support -+ error_bdb(EOPNOTSUPP, "DBE-CREATE"); -+#else - if (uint_p(STACK_0)) sv_timeout = I_to_uint(STACK_0); - if (uint_p(STACK_1)) cl_timeout = I_to_uint(STACK_1); - host_restart: -@@ -384,6 +390,7 @@ DEFUN(BDB:DBE-CREATE,&key PASSWORD ENCRY - STACK_2 = value1; - goto host_restart; - } -+#endif - } - if (!missingp(STACK_4)) /* :PASSWD */ - dbe_set_encryption(dbe,&STACK_3,&STACK_4); +@@ -2216,7 +2217,7 @@ DEFUN(BDB:DB-COMPACT, db &key TRANSACTIO + c_data.compact_timeout = timeout; + c_data.compact_pages = pages; + SYSCALL(db->compact,(db,txn,pstart,pstop,&c_data,flags,&end)); +- pushSTACK(uint32_to_I(c_data.compact_empty_buckets)); ++/*pushSTACK(uint32_to_I(c_data.compact_empty_buckets));*/ + pushSTACK(uint32_to_I(c_data.compact_pages_free)); + pushSTACK(uint32_to_I(c_data.compact_pages_examine)); + pushSTACK(uint32_to_I(c_data.compact_levels)); diff --git a/clisp-glibc-fix.patch b/clisp-glibc-fix.patch deleted file mode 100644 index f765a8b..0000000 --- a/clisp-glibc-fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -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-hostname.patch b/clisp-hostname.patch deleted file mode 100644 index 144ab9d..0000000 --- a/clisp-hostname.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- src/socket.d.orig 2009-10-08 08:45:13.000000000 -0600 -+++ src/socket.d 2012-01-12 11:22:24.701723636 -0700 -@@ -57,8 +57,8 @@ - /* ============ hostnames and IP addresses only (no sockets) ============ - - Fetches the machine's host name. -- get_hostname(host =); -- The name is allocated on the stack, with dynamic extent. -+ get_hostname(hostname); -+ where hostname is an array of MAXHOSTNAMELEN+1 characters. - < const char* host: The host name. - (Note: In some cases we could get away with less system calls by simply - setting -@@ -67,13 +67,12 @@ - sds: never: you will always get localhost/127.0.0.1 - what's the point? */ - #if defined(HAVE_GETHOSTNAME) - /* present on all supported unix systems and on woe32 */ -- #define get_hostname(host_assignment) \ -- do { var char hostname[MAXHOSTNAMELEN+1]; \ -+ #define get_hostname(hostname) \ -+ do { \ - begin_system_call(); \ - if ( gethostname(&hostname[0],MAXHOSTNAMELEN) <0) { SOCK_error(); } \ - end_system_call(); \ - hostname[MAXHOSTNAMELEN] = '\0'; \ -- host_assignment &hostname[0]; \ - } while(0) - #else - #error get_hostname is not defined -@@ -207,8 +206,8 @@ LISPFUNN(machine_instance,0) - (if (or (null address) (zerop (length address))) - hostname - (apply #'string-concat hostname " [" (inet-ntop address) "]"))) */ -- var const char* host; -- get_hostname(host =); -+ var char host[MAXHOSTNAMELEN+1]; -+ get_hostname(host); - result = asciz_to_string(host,O(misc_encoding)); /* hostname as result */ - #ifdef HAVE_GETHOSTBYNAME - pushSTACK(result); /* hostname as 1st string */ -@@ -389,8 +388,8 @@ local int resolve_host1 (const void* add - modexp struct hostent* resolve_host (object arg) { - var struct hostent* he; - if (eq(arg,S(Kdefault))) { -- var char* host; -- get_hostname(host =); -+ var char host[MAXHOSTNAMELEN+1]; -+ get_hostname(host); - begin_system_call(); - he = gethostbyname(host); - end_system_call(); -@@ -724,8 +723,9 @@ global SOCKET connect_to_x_server (const - if (conntype == conn_tcp) { - var unsigned short port = X_TCP_PORT+display; - if (host[0] == '\0') { -- get_hostname(host =); -- fd = with_host_port(host,port,&connect_to_x_via_ip,NULL); -+ var char hostname[MAXHOSTNAMELEN+1]; -+ get_hostname(hostname); -+ fd = with_host_port(hostname,port,&connect_to_x_via_ip,NULL); - } else { - fd = with_host_port(host,port,&connect_to_x_via_ip,NULL); - } -@@ -798,8 +798,8 @@ global host_data_t * socket_getlocalname - if (socket_getlocalname_aux(socket_handle,hd) == NULL) - return NULL; - if (resolve_p) { /* Fill in hd->truename. */ -- var const char* host; -- get_hostname(host =); /* was: host = "localhost"; */ -+ var char host[MAXHOSTNAMELEN+1]; -+ get_hostname(host); /* was: host = "localhost"; */ - ASSERT(strlen(host) <= MAXHOSTNAMELEN); - strcpy(hd->truename,host); - } else { diff --git a/clisp-link.dif b/clisp-link.dif new file mode 100644 index 0000000..abed287 --- /dev/null +++ b/clisp-link.dif @@ -0,0 +1,15 @@ +--- + src/clisp-link.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- src/clisp-link.in ++++ src/clisp-link.in 2016-11-29 12:56:40.625559126 +0000 +@@ -578,7 +578,7 @@ case "$1" in + # when running "CLISP=./clisp ./clisp-link install " + # in the build directory, avoid "cp: `...' and `...' are the same file" + if [ "${absolute_moduledir}" != "${absdestdir}/$moduledir" ]; then +- make clisp-module-distrib LN=${INSTALL_DATA-cp} distribdir="${absdestdir}/$moduledir" ++ make clisp-module-distrib LN="${INSTALL_DATA-cp}" distribdir="${absdestdir}/$moduledir" + mkdir -p ${absdestdir}/${DYNMOD}; + for f in ${DYNDIR_FILES}; do + cp ${f} ${absdestdir}/${DYNMOD}/ diff --git a/clisp-linux.patch b/clisp-linux.patch index adf871a..48792d3 100644 --- a/clisp-linux.patch +++ b/clisp-linux.patch @@ -1,19 +1,10 @@ --- - modules/bindings/glibc/linux.lisp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + modules/bindings/glibc/linux.lisp | 2 ++ + 1 file changed, 2 insertions(+) --- a/modules/bindings/glibc/linux.lisp +++ b/modules/bindings/glibc/linux.lisp -@@ -86,7 +86,7 @@ - - (def-c-type __key_t) ; int - --(c-lines "#include ~%") -+(c-lines "#include ~%") - (def-c-type __ipc_pid_t) ; ushort - - ; --------------------------- ----------------------------------- -@@ -293,6 +293,8 @@ +@@ -294,6 +294,8 @@ ;; for robust mutexes (def-c-const EOWNERDEAD (:documentation "Owner died")) ; 130 (def-c-const ENOTRECOVERABLE (:documentation "State not recoverable")) ; 131 diff --git a/clisp.changes b/clisp.changes index e46a82a..7a3815d 100644 --- a/clisp.changes +++ b/clisp.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Nov 29 13:45:20 UTC 2016 - werner@suse.de + +- Update to Mercurial source code from 2016/11/28 + * which shows 2630 new lines in src/Changelog + * Support of new CPU types as well as better 64bit architectures +- Remove patches clisp-glibc-fix.patch and clisp-hostname.patch + as now upstream +- Modify the patches + clisp-2.39-clx.dif + clisp-2.39-ia64-wooh.dif + clisp-2.49-clx_demos.dif + clisp-2.49-configure.dif + clisp-2.49-personality.patch + clisp-2.49-rpath.dif + clisp-db6.diff + clisp-linux.patch +- Add patch clisp-link.dif to get module asdf for console + support well done + ------------------------------------------------------------------- Thu Oct 27 10:52:29 UTC 2016 - werner@suse.de diff --git a/clisp.spec b/clisp.spec index 115fa53..d74a835 100644 --- a/clisp.spec +++ b/clisp.spec @@ -18,16 +18,18 @@ # minimum suse version where the full featured package builds %define min_suse_ver 1030 +%define uuid 536a48a9 Name: clisp -Version: 2.49 +Version: 2.49+ Release: 0 Summary: A Common Lisp Interpreter License: GPL-2.0+ Group: Development/Languages/Other Url: http://clisp.cons.org -Source: http://downloads.sf.net/clisp/%name-%version.tar.bz2 +#Source: http://downloads.sf.net/clisp/%name-%version.tar.bz2 +Source: %name-%uuid.tar.bz2 Source3: clisp-rpmlintrc Source4: README.SuSE # PATCH-EXTEND-OPENSUSE Set the process execution domain @@ -48,12 +50,9 @@ Patch7: clisp-2.49-postgresql.dif Patch8: clisp-2.49-rpath.dif # PATCH-FIX-OPENSUSE Correct path for header for System V IPC system calls Patch12: clisp-linux.patch -# PATCH-FIX-OPENSUSE Glibc got rid of unused __swblk_t type therefore update linux.lisp -Patch13: clisp-glibc-fix.patch -#PATCH-FIX-UPSTREAM patch#3474660 changeset 15557 4f5985f83127 -Patch14: clisp-hostname.patch # PATCH-EXTEND-UPSTREAM Make armv7l work Patch15: clisp-arm.patch +Patch14: clisp-link.dif Patch16: clisp-db6.diff #PATCH-FIX-UPSTREAM boo#1007196 Patch17: modules_readline_readline.lisp.patch @@ -128,7 +127,7 @@ with the file README. The subdirectory contains two nice applications. %prep -%setup -qT -b0 +%setup -qT -b0 -n clisp-%uuid %patch1 -p1 -b .sel %patch2 -p1 -b .wooh %patch3 -p1 -b .clx @@ -137,15 +136,12 @@ contains two nice applications. %patch6 -p1 -b .demos %patch7 -p1 -b .psql %patch8 -p1 -b .rpath -%patch12 -p1 -%if 0%{?suse_version} > 1220 -%patch13 -p1 -b .glibc -%endif -%patch14 -p0 -%patch15 -p0 -%patch16 -p1 +%patch12 -p1 -b .p12 +%patch14 -p0 -b .p14 +%patch15 -p0 -b .p15 +%patch16 -p1 -b .p16 %if 0%{rlver} >= 70 -%patch17 -p0 +%patch17 -p0 -b .p17 %endif %build @@ -206,8 +202,8 @@ unset cfi386 noexec nommap safety # # Environment for the case of missing terminal # -%global _configure screen -L -D -m ./configure -%global _make screen -L -D -m make +%global _configure screen -L -D -m setarch $(uname -m) -R ./configure +%global _make screen -L -D -m setarch $(uname -m) -R make SCREENDIR=$(mktemp -d ${PWD}/screen.XXXXXX) || exit 1 SCREENRC=${SCREENDIR}/clisp export SCREENRC SCREENDIR @@ -252,6 +248,8 @@ tail -q -s 0.5 -f $SCREENLOG & pid=$! --with-readline \ --with-dynamic-modules \ --with-gettext \ + --with-module=asdf \ + --with-module=editor \ %if 0%{?suse_version} >= %min_suse_ver --with-module=dbus \ %endif @@ -261,7 +259,6 @@ tail -q -s 0.5 -f $SCREENLOG & pid=$! --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 \ @@ -293,12 +290,12 @@ CLXLIB=${LSPLIB}/full # # Install the current system # -make -C build install prefix=%{_prefix} \ +setarch $(uname -m) -R make -C build install prefix=%{_prefix} \ exec_prefix=%{_prefix} \ mandir=%{_mandir} \ libdir=%{_libdir} \ DESTDIR=%{buildroot} \ - INSTALL_DATA='install -cm 0444' + INSTALL_DATA="install -cm 0444" # # The CLX interface