10 Aug
2017
10 Aug
'17
12:13
Hello community, here is the log from the commit of package clisp for openSUSE:Factory checked in at 2017-08-10 14:05:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clisp (Old) and /work/SRC/openSUSE:Factory/.clisp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clisp" Thu Aug 10 14:05:35 2017 rev:42 rq:515027 version:2.49.60+ Changes: -------- --- /work/SRC/openSUSE:Factory/clisp/clisp.changes 2017-02-13 07:50:09.521340664 +0100 +++ /work/SRC/openSUSE:Factory/.clisp.new/clisp.changes 2017-08-10 14:13:13.742942008 +0200 @@ -1,0 +2,20 @@ +Thu Jul 27 13:29:56 UTC 2017 - werner@suse.de + +- Try to build on all platforms with new configure option + --enable-portability ... let us see if this works + +------------------------------------------------------------------- +Thu Jul 27 13:08:17 UTC 2017 - werner@suse.de + +- Update to Mercurial source code from 2017/06/25 + aka test version 2.49.60+ +- Modify the patches + * clisp-2.49-configure.dif + * clisp-2.49-gctoken.dif + * clisp-2.49-rpath.dif + * clisp-arm.patch + * clisp-link.dif +- Remove patch modules_readline_readline.lisp.patch + as now the version of readline library is automatically detected + +------------------------------------------------------------------- Old: ---- clisp-536a48a9.tar.bz2 modules_readline_readline.lisp.patch New: ---- clisp-9c43d428.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clisp.spec ++++++ --- /var/tmp/diff_new_pack.tiYwTP/_old 2017-08-10 14:13:15.414706621 +0200 +++ /var/tmp/diff_new_pack.tiYwTP/_new 2017-08-10 14:13:15.418706058 +0200 @@ -17,11 +17,10 @@ # minimum suse version where the full featured package builds -%define min_suse_ver 1030 -%define uuid 536a48a9 +%define uuid 9c43d428 Name: clisp -Version: 2.49+ +Version: 2.49.60+ Release: 0 Summary: A Common Lisp Interpreter License: GPL-2.0+ @@ -54,14 +53,12 @@ Patch15: clisp-arm.patch Patch14: clisp-link.dif Patch16: clisp-db6.diff -#PATCH-FIX-UPSTREAM boo#1007196 -Patch17: modules_readline_readline.lisp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global vimdir %{_datadir}/vim/site/after/syntax -# exclude from src/lispbibl.d "CLISP not ported to this platform" -ExcludeArch: ppc64 ppc64le s390x armv4l BuildRequires: db-devel +BuildRequires: dbus-1-devel +BuildRequires: fdupes BuildRequires: ffcall BuildRequires: gdbm-devel BuildRequires: gtk2-devel @@ -74,11 +71,7 @@ BuildRequires: readline-devel BuildRequires: screen BuildRequires: vim-data -%if 0%{?suse_version} >= %min_suse_ver -BuildRequires: dbus-1-devel -BuildRequires: fdupes BuildRequires: xorg-x11-devel -%endif # # If set to yes do not forget to add # gcc-c++ @@ -141,9 +134,6 @@ %patch14 -p0 -b .p14 %patch15 -p0 -b .p15 %patch16 -p1 -b .p16 -%if 0%{rlver} >= 70 -%patch17 -p0 -b .p17 -%endif %build # @@ -168,41 +158,62 @@ else CC="gcc" fi -CC="${CC} -g ${RPM_OPT_FLAGS} -fno-strict-aliasing -fPIC -pipe" -case "$RPM_ARCH" in +CC="${CC} -g ${RPM_OPT_FLAGS} -falign-functions=4 -fno-strict-aliasing -fPIC -pipe" +case "$(uname -m)" in i[0-9]86) - CC="${CC} -falign-functions=4 -mieee-fp -ffloat-store" ;; - arm) CC="${CC}" ;; + CC="${CC} -mieee-fp -ffloat-store" ;; + arm*) CC="${CC}" ;; + aarch64)CC="${CC}" ;; ppc) CC="${CC}" ;; s390) CC="${CC}" ;; x86_64) CC="${CC} -fno-gcse" ;; - sparc*) CC="${CC} -fno-gcse" ;; + sparc*) CC="${CC} -mcpu=v9 -fno-gcse" ;; ppc64) CC="${CC} -fno-gcse -mpowerpc64" ;; s390x) CC="${CC} -fno-gcse" ;; ia64) CC="${CC} -fno-gcse" ;; - axp|alpha) CC="${CC}" ;; + axp|alpha) + CC="${CC}" ;; esac -noexec='-DLINUX_NOEXEC_HEAPCODES' +noexec='-DKERNELVOID32A_HEAPCODES' nommap='-DNO_MULTIMAP_SHM -DNO_MULTIMAP_FILE -DNO_SINGLEMAP -DNO_TRIVIALMAP' 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 +MYCFLAGS="$(getconf LFS_CFLAGS)" +if grep -q _DEFAULT_SOURCE /usr/include/features.h +then + MYCFLAGS="${MYCFLAGS} -D_GNU_SOURCE -D_DEFAULT_SOURCE" +else + MYCFLAGS="${MYCFLAGS} -D_GNU_SOURCE" +fi +MYCFLAGS="${MYCFLAGS} -Wno-unused -Wno-uninitialized" +port='' +case "$(uname -m)" in i[0-9]86) - MYCFLAGS="${MYCFLAGS} ${noexec}" ;; - arm) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; + MYCFLAGS="${MYCFLAGS}" ;; + arm*) MYCFLAGS="${MYCFLAGS} ${noexec}" ;; + aarch64)MYCFLAGS="${MYCFLAGS}" + port=--enable-portability ;; 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}" ;; + x86_64) MYCFLAGS="${MYCFLAGS}" ;; + sparc*) MYCFLAGS="${MYCFLAGS} ${nommap} ${safety}" ;; + ppc64) MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD" + port=--enable-portability ;; + ppc64le)MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD" + port=--enable-portability ;; + s390x) MYCFLAGS="${MYCFLAGS} ${safety} -DWIDE_HARD" + port=--enable-portability ;; + ia64) MYCFLAGS="${MYCFLAGS} ${nommap} ${safety}" ;; + axp|alpha) + MYCFLAGS="${MYCFLAGS} ${nommap}" ;; esac export CC export MYCFLAGS -unset cfi386 noexec nommap safety +unset noexec nommap safety +# +# Report final architectures +# +echo $(uname -i -m -p) %_build_arch %_arch +echo | $CC $MYCFLAGS -v -E - 2>&1 | grep /cc1 # # Environment for the case of missing terminal # @@ -245,6 +256,7 @@ > $SCREENLOG tail -q -s 0.5 -f $SCREENLOG & pid=$! %_configure build ${DEBUG} \ + ${port+"$port"} \ --prefix=%{_prefix} \ --exec-prefix=%{_prefix} \ --libdir=%{_libdir} \ @@ -255,9 +267,7 @@ --with-gettext \ --with-module=asdf \ --with-module=editor \ -%if 0%{?suse_version} >= %min_suse_ver --with-module=dbus \ -%endif --with-module=queens \ --with-module=gdbm \ --with-module=gtk2 \ @@ -351,9 +361,7 @@ rm -rf %{buildroot}${LSPLIB}/new-clx/demos/ find %{buildroot} -type f | xargs -r chmod u+w chmod a+x %{buildroot}${LSPLIB}/build-aux/{config,depcomp}* -%if 0%{?suse_version} >= %min_suse_ver %fdupes %{buildroot}${LSPLIB}/ -%endif %find_lang clisp %find_lang clisplow clisp.lang ++++++ clisp-2.49-configure.dif ++++++ --- /var/tmp/diff_new_pack.tiYwTP/_old 2017-08-10 14:13:15.586682406 +0200 +++ /var/tmp/diff_new_pack.tiYwTP/_new 2017-08-10 14:13:15.590681842 +0200 @@ -1,14 +1,14 @@ --- - clisp-536a48a9/configure | 4 ++-- - clisp-536a48a9/src/lispbibl.d | 16 +++++++++++----- - clisp-536a48a9/src/makemake.in | 16 +++++++++++++--- - clisp-536a48a9/utils/modprep.lisp | 2 +- - 4 files changed, 27 insertions(+), 11 deletions(-) + clisp-9c43d428/configure | 4 ++-- + clisp-9c43d428/src/lispbibl.d | 16 +++++++++++----- + clisp-9c43d428/src/makemake.in | 15 ++++++++++++--- + clisp-9c43d428/utils/modprep.lisp | 2 +- + 4 files changed, 26 insertions(+), 11 deletions(-) ---- clisp-536a48a9/configure -+++ clisp-536a48a9/configure 2016-11-29 16:47:05.962094941 +0000 -@@ -392,11 +392,11 @@ do - passnext=both ;; +--- clisp-9c43d428/configure ++++ clisp-9c43d428/configure 2017-07-27 12:30:20.772795623 +0000 +@@ -405,11 +405,11 @@ do + passnext=makemake ;; --vimdir=* | --vimdi=* | --vimd=* | --vim=* | --vi=*) - subdir_configure_args="$subdir_configure_args $arg" @@ -21,9 +21,9 @@ makemake_args="$makemake_args --vimdir=" prev=vimdir passnext=both ;; ---- clisp-536a48a9/src/lispbibl.d -+++ clisp-536a48a9/src/lispbibl.d 2016-11-29 16:47:05.966094859 +0000 -@@ -66,7 +66,7 @@ +--- clisp-9c43d428/src/lispbibl.d ++++ clisp-9c43d428/src/lispbibl.d 2017-07-27 12:22:29.421471307 +0000 +@@ -175,7 +175,7 @@ #define PC386 /* IBMPC-compatible with 80386/80486-processor */ #endif #ifdef GENERIC_UNIX @@ -32,7 +32,7 @@ #define PC386 #endif #if (defined(sun) && defined(unix) && defined(sparc)) -@@ -167,8 +167,14 @@ +@@ -278,8 +278,14 @@ #endif #ifdef GENERIC_UNIX #define UNIX @@ -48,7 +48,7 @@ #endif #ifdef __GNU__ #define UNIX_HURD /* the GNU system (Hurd + glibc) */ -@@ -1110,7 +1116,7 @@ typedef signed int signean; +@@ -1231,7 +1237,7 @@ typedef signed int signean; address of its component 'ident' and return it as number: */ #include#ifndef offsetof @@ -57,7 +57,7 @@ #endif /* Determine the offset of an array 'ident' in a struct of the type 'type': */ #if defined(__cplusplus) || defined(MICROSOFT) -@@ -3148,9 +3154,9 @@ typedef signed_int_with_n_bits(intVsize) +@@ -3433,9 +3439,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 @@ -69,9 +69,9 @@ #endif #elif !(oint_addr_shift==0) #define type_data_object(type,data) \ ---- clisp-536a48a9/src/makemake.in -+++ clisp-536a48a9/src/makemake.in 2016-12-05 15:16:19.800662503 +0000 -@@ -246,6 +246,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false} +--- clisp-9c43d428/src/makemake.in ++++ clisp-9c43d428/src/makemake.in 2017-07-27 12:29:06.778157626 +0000 +@@ -250,6 +250,9 @@ verbose=${CLISP_MAKEMAKE_VERBOSE:-false} # Handle --with-... arguments while test -z "$endofargs"; do case "$1" in @@ -81,7 +81,7 @@ -verb* | --verb* ) verbose=`echol "$1"|sed 's/-*v[^=]*=*//'` test -n "${verbose}" || verbose=true -@@ -1115,6 +1118,7 @@ else +@@ -1147,6 +1150,7 @@ else fi # Main cpu dependencies: @@ -89,15 +89,15 @@ cpu=$host_cpu_c_abi if test -z "$cpu"; then echo "$0: WARNING: host_cpu_c_abi is void; using host_cpu=${host_cpu}" >&2 -@@ -1125,6 +1129,7 @@ if test -z "$cpu"; then - * ) cpu=${host_cpu} +@@ -1157,6 +1161,7 @@ if test -z "$cpu"; then + * ) cpu=${host_cpu} ;; esac fi +set +x test "${verbose}" = true -o "${verbose}" = yes && \ cat < &2 -@@ -1240,7 +1245,7 @@ if [ $XCC_GCC = true ] ; then +@@ -1293,7 +1298,7 @@ if [ $XCC_GCC = true ] ; then fi # For platforms that use global register variables... case "$cpu" in @@ -106,27 +106,26 @@ if [ $CROSS = false ] ; then case "$XCC_GCC_VERSION" in 3.1*) -@@ -1272,6 +1277,10 @@ if [ $XCC_GCC = true ] ; then +@@ -1333,6 +1338,9 @@ 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 -@@ -1602,7 +1611,7 @@ if [ "$cpu" = hppa ] ; then - ARI_ASMD=$ARI_ASMD' arihppa' - ARI_ASMS=$ARI_ASMS' arihppa' - fi --if [ "$cpu" = arm ] ; then -+if [ "$cpu" = arm -o "$cpu" = armel ] ; then - ARI_ASMD=$ARI_ASMD' ariarm' - ARI_ASMS=$ARI_ASMS' ariarm' - fi -@@ -3417,8 +3426,9 @@ if [ $CROSS = false ] ; then + if [ $CROSS = false ] ; then +@@ -1714,7 +1722,7 @@ if [ "${enable_portability}" = no ] ; th + ARI_ASMD=$ARI_ASMD' arihppa' + ARI_ASMS=$ARI_ASMS' arihppa' + fi +- if [ "$cpu" = arm -o "$cpu" = armhf ] ; then ++ if [ "$cpu" = arm -o "$cpu" = armhf -o "$cpu" = armel ] ; then + ARI_ASMD=$ARI_ASMD' ariarm' + ARI_ASMS=$ARI_ASMS' ariarm' + fi +@@ -3559,8 +3567,9 @@ if [ $CROSS = false ] ; then echol if [ "${with_dynamic_modules}" != no ]; then depends="full install-modules force" @@ -137,8 +136,8 @@ echotab "mkdir -p \$(DESTDIR)\$(lisplibdir)/dynmod" echotab "DESTDIR=\`cd \"\$(DESTDIR)\$(lisplibdir)\"; pwd\` CLISP='./clisp -q -norc' ./clisp-link install \$(MODULES)" echol ---- clisp-536a48a9/utils/modprep.lisp -+++ clisp-536a48a9/utils/modprep.lisp 2016-11-29 16:47:05.970094777 +0000 +--- clisp-9c43d428/utils/modprep.lisp ++++ clisp-9c43d428/utils/modprep.lisp 2017-07-27 12:22:29.421471307 +0000 @@ -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)))))) ++++++ clisp-2.49-gctoken.dif ++++++ --- /var/tmp/diff_new_pack.tiYwTP/_old 2017-08-10 14:13:15.602680154 +0200 +++ /var/tmp/diff_new_pack.tiYwTP/_new 2017-08-10 14:13:15.606679591 +0200 @@ -1,6 +1,9 @@ + + +diff --git a/utils/gctrigger.c b/utils/gctrigger.c --- a/utils/gctrigger.c +++ b/utils/gctrigger.c -@@ -599,6 +599,7 @@ static inline void VectorToken_delete (V +@@ -601,6 +601,7 @@ static inline void VectorToken_delete (V static Token nexttoken (boolean within_prep_directive) { Token token; ++++++ clisp-2.49-rpath.dif ++++++ --- /var/tmp/diff_new_pack.tiYwTP/_old 2017-08-10 14:13:15.642674522 +0200 +++ /var/tmp/diff_new_pack.tiYwTP/_new 2017-08-10 14:13:15.642674522 +0200 @@ -1,10 +1,9 @@ ---- - src/aclocal.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/aclocal.m4 b/src/aclocal.m4 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 -@@ -6133,7 +6133,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], +@@ -7517,7 +7517,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 ++++++ clisp-536a48a9.tar.bz2 -> clisp-9c43d428.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/clisp/clisp-536a48a9.tar.bz2 /work/SRC/openSUSE:Factory/.clisp.new/clisp-9c43d428.tar.bz2 differ: char 11, line 1 ++++++ clisp-arm.patch ++++++ ++++ 778 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/clisp/clisp-arm.patch ++++ and /work/SRC/openSUSE:Factory/.clisp.new/clisp-arm.patch ++++++ clisp-link.dif ++++++ --- /var/tmp/diff_new_pack.tiYwTP/_old 2017-08-10 14:13:15.798652560 +0200 +++ /var/tmp/diff_new_pack.tiYwTP/_new 2017-08-10 14:13:15.810650871 +0200 @@ -4,7 +4,7 @@ 2 files changed, 4 insertions(+), 2 deletions(-) --- src/clisp-link.in -+++ src/clisp-link.in 2016-11-29 12:56:40.625559126 +0000 ++++ src/clisp-link.in 2017-07-27 12:34:06.144647126 +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" @@ -15,8 +15,8 @@ for f in ${DYNDIR_FILES}; do cp ${f} ${absdestdir}/${DYNMOD}/ --- src/lispbibl.d -+++ src/lispbibl.d 2016-11-29 14:23:35.426290281 +0000 -@@ -1450,6 +1450,8 @@ typedef SLONG sint32; /* signed 32 bi ++++ src/lispbibl.d 2017-07-27 12:34:06.152646979 +0000 +@@ -1571,6 +1571,8 @@ typedef SLONG sint32; /* signed 32 bi /* Emulate 64-Bit-numbers using two 32-Bit-numbers. */ typedef struct { sintL hi; uintL lo; } sintL2; /* signed 64 Bit integer */ typedef struct { uintL hi; uintL lo; } uintL2; /* unsigned 64 Bit integer */ @@ -25,7 +25,7 @@ #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 +@@ -11973,7 +11975,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! */