From 58f7f67c7fb9b9a3463ccdc61f2b39a79fcc568ee60fb63f40cb6ecb1a45a93f Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 10 Feb 2017 08:52:49 +0000 Subject: [PATCH 1/3] . OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/clisp?expand=0&rev=64 --- clisp.changes | 6 ++++++ clisp.spec | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/clisp.changes b/clisp.changes index 1f0ed8c..cb7acee 100644 --- a/clisp.changes +++ b/clisp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 10 08:52:25 UTC 2017 - werner@suse.de + +- Collect some informations on the build system for debugging + a random error on sockets during test suite + ------------------------------------------------------------------- Thu Jan 19 12:20:06 UTC 2017 - werner@suse.de diff --git a/clisp.spec b/clisp.spec index 21c34bc..54f518c 100644 --- a/clisp.spec +++ b/clisp.spec @@ -127,6 +127,15 @@ with the file README. The subdirectory contains two nice applications. %prep +# +# Collect some informations on the build system for debugging +# a random error on sockets during test suite +# +type -p systemd-detect-virt > /dev/null 2>&1 && systemd-detect-virt +type -p uname > /dev/null 2>&1 && uname -a +type -p netstat > /dev/null 2>&1 && netstat -i +type -p netstat > /dev/null 2>&1 && netstat -x +# %setup -qT -b0 -n clisp-%uuid %patch1 -p1 -b .sel %patch2 -p1 -b .wooh From 3b4c3241a9b86da9637b9a196ce5dc564d138e49dc3da4a5da589e3abff1d86b Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 10 Feb 2017 10:35:14 +0000 Subject: [PATCH 2/3] . OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/clisp?expand=0&rev=65 --- clisp-link.dif | 12 +++++++++++- clisp.spec | 12 ++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/clisp-link.dif b/clisp-link.dif index f2ae8f2..df9b1b6 100644 --- a/clisp-link.dif +++ b/clisp-link.dif @@ -1,6 +1,7 @@ --- src/clisp-link.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + src/lispbibl.d | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) --- src/clisp-link.in +++ src/clisp-link.in 2016-11-29 12:56:40.625559126 +0000 @@ -24,3 +25,12 @@ #endif /* Use 'uintX' and 'sintX' for Integers with approximately given width and a minumum of storage space. */ +@@ -11622,7 +11622,7 @@ re-enters the corresponding top-level lo + #define pushSTACK(obj) (STACK_(-1) = (obj), STACK skipSTACKop -1) + /* Almost equivalent with *--STACK = obj resp. *STACK++ = obj , but + Careful: first enter the object into STACK_(-1), THEN modify the STACK! */ +-#define popSTACK() (STACK skipSTACKop 1, STACK_(-1)) ++#define popSTACK() ({STACK skipSTACKop 1; STACK_(-1);}) + #define skipSTACK(n) (STACK skipSTACKop (sintP)(n)) + + #if defined(GNU) && defined(M68K) && !defined(NO_ASM) && !defined(WIDE) && defined(STACK_register) diff --git a/clisp.spec b/clisp.spec index 54f518c..ee1667d 100644 --- a/clisp.spec +++ b/clisp.spec @@ -67,11 +67,13 @@ BuildRequires: gdbm-devel BuildRequires: gtk2-devel BuildRequires: libglade2-devel BuildRequires: libsigsegv-devel +BuildRequires: net-tools BuildRequires: openssl-devel BuildRequires: pcre-devel BuildRequires: postgresql-devel BuildRequires: readline-devel BuildRequires: screen +BuildRequires: systemd BuildRequires: vim-data %if 0%{?suse_version} >= %min_suse_ver BuildRequires: dbus-1-devel @@ -131,10 +133,12 @@ contains two nice applications. # Collect some informations on the build system for debugging # a random error on sockets during test suite # -type -p systemd-detect-virt > /dev/null 2>&1 && systemd-detect-virt -type -p uname > /dev/null 2>&1 && uname -a -type -p netstat > /dev/null 2>&1 && netstat -i -type -p netstat > /dev/null 2>&1 && netstat -x +type -p systemd-detect-virt > /dev/null 2>&1 && systemd-detect-virt || : +type -p uname > /dev/null 2>&1 && uname -a || : +type -p netstat > /dev/null 2>&1 && netstat -i || : +type -p netstat > /dev/null 2>&1 && netstat -x || : +type -p ip > /dev/null 2>&1 && ip link || : +type -p ss > /dev/null 2>&1 && ss -x || : # %setup -qT -b0 -n clisp-%uuid %patch1 -p1 -b .sel From 503bf5dc8fa220b70fd907caa778405bc3a519e4f07e453de2e8507ac69cff85 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 10 Feb 2017 11:17:45 +0000 Subject: [PATCH 3/3] . OBS-URL: https://build.opensuse.org/package/show/devel:languages:misc/clisp?expand=0&rev=66 --- clisp.spec | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/clisp.spec b/clisp.spec index ee1667d..e5b6fdd 100644 --- a/clisp.spec +++ b/clisp.spec @@ -73,7 +73,6 @@ BuildRequires: pcre-devel BuildRequires: postgresql-devel BuildRequires: readline-devel BuildRequires: screen -BuildRequires: systemd BuildRequires: vim-data %if 0%{?suse_version} >= %min_suse_ver BuildRequires: dbus-1-devel @@ -129,17 +128,6 @@ with the file README. The subdirectory contains two nice applications. %prep -# -# Collect some informations on the build system for debugging -# a random error on sockets during test suite -# -type -p systemd-detect-virt > /dev/null 2>&1 && systemd-detect-virt || : -type -p uname > /dev/null 2>&1 && uname -a || : -type -p netstat > /dev/null 2>&1 && netstat -i || : -type -p netstat > /dev/null 2>&1 && netstat -x || : -type -p ip > /dev/null 2>&1 && ip link || : -type -p ss > /dev/null 2>&1 && ss -x || : -# %setup -qT -b0 -n clisp-%uuid %patch1 -p1 -b .sel %patch2 -p1 -b .wooh @@ -287,13 +275,29 @@ tail -q -s 0.5 -f $SCREENLOG & pid=$! # # Stop tail # +sleep 1 kill $pid # # Check for errors # -test -z "$(ls build/tests/*.erg 2>/dev/null)" +check=no +for err in build/tests/*.erg +do + test -e "$err" || break + check=yes + cat $err +done +if test $check != no +then + type -p uname > /dev/null 2>&1 && uname -a || : + type -p netstat > /dev/null 2>&1 && netstat -i || : + type -p netstat > /dev/null 2>&1 && netstat -x || : + type -p ip > /dev/null 2>&1 && ip link || : + type -p ss > /dev/null 2>&1 && ss -x || : +fi +# %install # # Clean