From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- .../clisp-2.48-bits_ipctypes_to_sys_ipc.patch | 21 ++++++++ .../clisp-2.49-bits_ipctypes_to_sys_ipc.patch | 21 ++++++++ dev-lisp/clisp/files/clisp-2.49-get_hostname.patch | 56 ++++++++++++++++++++++ dev-lisp/clisp/files/clisp-2.49-readline-7.patch | 10 ++++ dev-lisp/clisp/files/clisp-2.49-tinfo.patch | 15 ++++++ 5 files changed, 123 insertions(+) create mode 100644 dev-lisp/clisp/files/clisp-2.48-bits_ipctypes_to_sys_ipc.patch create mode 100644 dev-lisp/clisp/files/clisp-2.49-bits_ipctypes_to_sys_ipc.patch create mode 100644 dev-lisp/clisp/files/clisp-2.49-get_hostname.patch create mode 100644 dev-lisp/clisp/files/clisp-2.49-readline-7.patch create mode 100644 dev-lisp/clisp/files/clisp-2.49-tinfo.patch (limited to 'dev-lisp/clisp/files') diff --git a/dev-lisp/clisp/files/clisp-2.48-bits_ipctypes_to_sys_ipc.patch b/dev-lisp/clisp/files/clisp-2.48-bits_ipctypes_to_sys_ipc.patch new file mode 100644 index 000000000000..4711a86decbe --- /dev/null +++ b/dev-lisp/clisp/files/clisp-2.48-bits_ipctypes_to_sys_ipc.patch @@ -0,0 +1,21 @@ +diff -ru a/modules/bindings/glibc/linux.lisp b/modules/bindings/glibc/linux.lisp +--- a/modules/bindings/glibc/linux.lisp 2008-10-10 16:15:49.000000000 +0300 ++++ b/modules/bindings/glibc/linux.lisp 2013-04-22 11:12:59.148502615 +0300 +@@ -67,7 +67,7 @@ + (def-c-type __daddr_t) ; int + (def-c-type __caddr_t) ; c-pointer + (def-c-type __time_t) ; long +-(def-c-type __swblk_t) ; long ++;(def-c-type __swblk_t) ; long + + (def-c-type __fd_mask ulong) + (eval-when (load compile eval) +@@ -86,7 +86,7 @@ + + (def-c-type __key_t) ; int + +-(c-lines "#include ~%") ++(c-lines "#include ~%") + (def-c-type __ipc_pid_t) ; ushort + + ; --------------------------- ----------------------------------- diff --git a/dev-lisp/clisp/files/clisp-2.49-bits_ipctypes_to_sys_ipc.patch b/dev-lisp/clisp/files/clisp-2.49-bits_ipctypes_to_sys_ipc.patch new file mode 100644 index 000000000000..8037157c9512 --- /dev/null +++ b/dev-lisp/clisp/files/clisp-2.49-bits_ipctypes_to_sys_ipc.patch @@ -0,0 +1,21 @@ +diff -ru a/modules/bindings/glibc/linux.lisp b/modules/bindings/glibc/linux.lisp +--- a/modules/bindings/glibc/linux.lisp 2008-10-08 19:36:19.000000000 +0300 ++++ b/modules/bindings/glibc/linux.lisp 2013-04-08 00:05:06.028305248 +0300 +@@ -67,7 +67,7 @@ + (def-c-type __daddr_t) ; int + (def-c-type __caddr_t) ; c-pointer + (def-c-type __time_t) ; long +-(def-c-type __swblk_t) ; long ++;(def-c-type __swblk_t) ; long + + (def-c-type __fd_mask ulong) + (eval-when (load compile eval) +@@ -86,7 +86,7 @@ + + (def-c-type __key_t) ; int + +-(c-lines "#include ~%") ++(c-lines "#include ~%") + (def-c-type __ipc_pid_t) ; ushort + + ; --------------------------- ----------------------------------- diff --git a/dev-lisp/clisp/files/clisp-2.49-get_hostname.patch b/dev-lisp/clisp/files/clisp-2.49-get_hostname.patch new file mode 100644 index 000000000000..5db3a71efbc3 --- /dev/null +++ b/dev-lisp/clisp/files/clisp-2.49-get_hostname.patch @@ -0,0 +1,56 @@ +diff -r -U1 clisp-2.49.orig/src/socket.d clisp-2.49/src/socket.d +--- clisp-2.49.orig/src/socket.d 2009-10-08 21:45:13.000000000 +0700 ++++ clisp-2.49/src/socket.d 2013-04-20 16:24:11.133895050 +0700 +@@ -59,5 +59,5 @@ + Fetches the machine's host name. +- get_hostname(host =); +- The name is allocated on the stack, with dynamic extent. +- < const char* host: The host name. ++ get_hostname(hostname); ++ where hostname is an array of MAXHOTNAMELEN+1 characters. ++ < const char host[]: The host name. + (Note: In some cases we could get away with less system calls by simply +@@ -69,10 +69,8 @@ + /* present on all supported unix systems and on woe32 */ +- #define get_hostname(host_assignment) \ +- do { var char hostname[MAXHOSTNAMELEN+1]; \ +- begin_system_call(); \ +- if ( gethostname(&hostname[0],MAXHOSTNAMELEN) <0) { SOCK_error(); } \ +- end_system_call(); \ +- hostname[MAXHOSTNAMELEN] = '\0'; \ +- host_assignment &hostname[0]; \ +- } while(0) ++static void get_hostname (char *hostname) { ++ begin_system_call(); ++ if (gethostname(hostname,MAXHOSTNAMELEN) < 0) { ANSIC_error(); } ++ end_system_call(); ++ hostname[MAXHOSTNAMELEN] = '\0'; ++} + #else +@@ -209,4 +207,4 @@ + (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 */ +@@ -391,4 +389,4 @@ + if (eq(arg,S(Kdefault))) { +- var char* host; +- get_hostname(host =); ++ var char host[MAXHOSTNAMELEN+1]; ++ get_hostname(host); + begin_system_call(); +@@ -726,3 +724,4 @@ + if (host[0] == '\0') { +- get_hostname(host =); ++ var char host[MAXHOSTNAMELEN+1]; ++ get_hostname(host); + fd = with_host_port(host,port,&connect_to_x_via_ip,NULL); +@@ -800,4 +799,4 @@ + 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); + ASSERT(strlen(host) <= MAXHOSTNAMELEN); diff --git a/dev-lisp/clisp/files/clisp-2.49-readline-7.patch b/dev-lisp/clisp/files/clisp-2.49-readline-7.patch new file mode 100644 index 000000000000..0be5bd8ccc20 --- /dev/null +++ b/dev-lisp/clisp/files/clisp-2.49-readline-7.patch @@ -0,0 +1,10 @@ +diff -r -U2 clisp-2.49.orig/modules/readline/readline.lisp clisp-2.49/modules/readline/readline.lisp +--- clisp-2.49.orig/modules/readline/readline.lisp 2010-01-07 04:18:03.000000000 +0600 ++++ clisp-2.49/modules/readline/readline.lisp 2016-09-29 22:23:53.837631568 +0700 +@@ -425,5 +425,5 @@ + (def-c-var gnu-readline-p (:name "rl_gnu_readline_p") (:type int) + (:documentation "True if this is real GNU readline.")) +-(def-c-var readline-state (:name "rl_readline_state") (:type int) ++(def-c-var readline-state (:name "rl_readline_state") (:type ulong) + (:documentation "Flags word encapsulating the current readline state.")) + (def-c-var editing-mode (:name "rl_editing_mode") (:type int) diff --git a/dev-lisp/clisp/files/clisp-2.49-tinfo.patch b/dev-lisp/clisp/files/clisp-2.49-tinfo.patch new file mode 100644 index 000000000000..72f40d585b5b --- /dev/null +++ b/dev-lisp/clisp/files/clisp-2.49-tinfo.patch @@ -0,0 +1,15 @@ +clisp does not need a full blown ncurses, but it does require a termcap or tinfo +I would have changed this in src/m4/termcap.m4 but configure.in fails terribly - JeR + + +--- a/src/configure ++++ b/src/configure +@@ -28613,7 +28613,7 @@ + return 0; + } + _ACEOF +-for ac_lib in '' ncurses termcap; do ++for ac_lib in '' tinfo ncurses termcap; do + if test -z "$ac_lib"; then + ac_res="none required" + else -- cgit v1.2.3