The package rpms/clisp.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/clisp.git/commit/?id=7d5ddf7eb7a1e08....
Change: +%ifarch %{power64}
Thanks.
Full change: ============
commit fee89f7955d7900d8de36743336f0222e1cd9ea6 Author: Jerry James loganjerry@gmail.com Date: Wed Aug 10 15:36:51 2022 -0600
Move preload.lisp files to the main package.
diff --git a/clisp.spec b/clisp.spec index 984e5b7..c68b773 100644 --- a/clisp.spec +++ b/clisp.spec @@ -16,7 +16,7 @@ Version: 2.49.93
%forgemeta
-Release: 25%{?dist} +Release: 26%{?dist} License: GPLv2+ URL: http://www.clisp.org/ Source0: %{forgesource} @@ -306,12 +306,14 @@ make -C build base-mod-check %{_libdir}/%{instdir}/base/lisp.run %dir %{_libdir}/%{instdir}/berkeley-db/ %{_libdir}/%{instdir}/berkeley-db/*.fas +%{_libdir}/%{instdir}/berkeley-db/preload.lisp %dir %{_libdir}/%{instdir}/bindings/ %dir %{_libdir}/%{instdir}/bindings/glibc/ %{_libdir}/%{instdir}/bindings/glibc/*.fas %dir %{_libdir}/%{instdir}/clx/ %dir %{_libdir}/%{instdir}/clx/new-clx/ %{_libdir}/%{instdir}/clx/new-clx/*.fas +%{_libdir}/%{instdir}/clx/new-clx/clx-preload.lisp %{_libdir}/%{instdir}/data/ %dir %{_libdir}/%{instdir}/dbus/ %{_libdir}/%{instdir}/dbus/*.fas @@ -323,18 +325,24 @@ make -C build base-mod-check %{_libdir}/%{instdir}/full/lisp.run %dir %{_libdir}/%{instdir}/gdbm/ %{_libdir}/%{instdir}/gdbm/*.fas +%{_libdir}/%{instdir}/gdbm/preload.lisp %dir %{_libdir}/%{instdir}/gtk2/ %{_libdir}/%{instdir}/gtk2/*.fas +%{_libdir}/%{instdir}/gtk2/preload.lisp %dir %{_libdir}/%{instdir}/libsvm/ %{_libdir}/%{instdir}/libsvm/*.fas +%{_libdir}/%{instdir}/libsvm/preload.lisp %dir %{_libdir}/%{instdir}/pari/ %{_libdir}/%{instdir}/pari/*.fas +%{_libdir}/%{instdir}/pari/preload.lisp %dir %{_libdir}/%{instdir}/pcre/ %{_libdir}/%{instdir}/pcre/*.fas +%{_libdir}/%{instdir}/pcre/preload.lisp %dir %{_libdir}/%{instdir}/postgresql/ %{_libdir}/%{instdir}/postgresql/*.fas %dir %{_libdir}/%{instdir}/rawsock/ %{_libdir}/%{instdir}/rawsock/*.fas +%{_libdir}/%{instdir}/rawsock/preload.lisp %dir %{_libdir}/%{instdir}/zlib/ %{_libdir}/%{instdir}/zlib/*.fas %{_datadir}/emacs/site-lisp/* @@ -353,7 +361,7 @@ make -C build base-mod-check %{_libdir}/%{instdir}/base/makevars %{_libdir}/%{instdir}/berkeley-db/Makefile %{_libdir}/%{instdir}/berkeley-db/*.h -%{_libdir}/%{instdir}/berkeley-db/*.lisp +%{_libdir}/%{instdir}/berkeley-db/dbi.lisp %{_libdir}/%{instdir}/berkeley-db/*.o %{_libdir}/%{instdir}/berkeley-db/*.sh %{_libdir}/%{instdir}/bindings/glibc/Makefile @@ -365,7 +373,9 @@ make -C build base-mod-check %{_libdir}/%{instdir}/clx/new-clx/README %{_libdir}/%{instdir}/clx/new-clx/Makefile %{_libdir}/%{instdir}/clx/new-clx/*.h -%{_libdir}/%{instdir}/clx/new-clx/*.lisp +%{_libdir}/%{instdir}/clx/new-clx/clx.lisp +%{_libdir}/%{instdir}/clx/new-clx/image.lisp +%{_libdir}/%{instdir}/clx/new-clx/resource.lisp %{_libdir}/%{instdir}/clx/new-clx/*.o %{_libdir}/%{instdir}/clx/new-clx/*.sh %{_libdir}/%{instdir}/config.h @@ -386,32 +396,33 @@ make -C build base-mod-check %{_libdir}/%{instdir}/full/makevars %{_libdir}/%{instdir}/gdbm/Makefile %{_libdir}/%{instdir}/gdbm/*.h -%{_libdir}/%{instdir}/gdbm/*.lisp +%{_libdir}/%{instdir}/gdbm/gdbm.lisp %{_libdir}/%{instdir}/gdbm/*.o %{_libdir}/%{instdir}/gdbm/*.sh %{_libdir}/%{instdir}/gtk2/Makefile %{_libdir}/%{instdir}/gtk2/*.cfg %{_libdir}/%{instdir}/gtk2/*.glade %{_libdir}/%{instdir}/gtk2/*.h -%{_libdir}/%{instdir}/gtk2/*.lisp +%{_libdir}/%{instdir}/gtk2/gtk.lisp %{_libdir}/%{instdir}/gtk2/*.o %{_libdir}/%{instdir}/gtk2/*.sh %{_libdir}/%{instdir}/libsvm/README %{_libdir}/%{instdir}/libsvm/Makefile %{_libdir}/%{instdir}/libsvm/*.h -%{_libdir}/%{instdir}/libsvm/*.lisp +%{_libdir}/%{instdir}/libsvm/libsvm.lisp %{_libdir}/%{instdir}/libsvm/*.o %{_libdir}/%{instdir}/libsvm/*.sh %{_libdir}/%{instdir}/linkkit/ %{_libdir}/%{instdir}/pari/README %{_libdir}/%{instdir}/pari/Makefile %{_libdir}/%{instdir}/pari/*.h -%{_libdir}/%{instdir}/pari/*.lisp +%{_libdir}/%{instdir}/pari/desc2lisp.lisp +%{_libdir}/%{instdir}/pari/pari.lisp %{_libdir}/%{instdir}/pari/*.o %{_libdir}/%{instdir}/pari/*.sh %{_libdir}/%{instdir}/pcre/Makefile %{_libdir}/%{instdir}/pcre/*.h -%{_libdir}/%{instdir}/pcre/*.lisp +%{_libdir}/%{instdir}/pcre/pcre.lisp %{_libdir}/%{instdir}/pcre/*.o %{_libdir}/%{instdir}/pcre/*.sh %{_libdir}/%{instdir}/postgresql/README @@ -423,7 +434,7 @@ make -C build base-mod-check %{_libdir}/%{instdir}/rawsock/demos/ %{_libdir}/%{instdir}/rawsock/Makefile %{_libdir}/%{instdir}/rawsock/*.h -%{_libdir}/%{instdir}/rawsock/*.lisp +%{_libdir}/%{instdir}/rawsock/sock.lisp %{_libdir}/%{instdir}/rawsock/*.o %{_libdir}/%{instdir}/rawsock/*.sh %{_libdir}/%{instdir}/zlib/Makefile @@ -435,6 +446,9 @@ make -C build base-mod-check
%changelog +* Wed Aug 10 2022 Jerry James loganjerry@gmail.com - 2.49.93-26 +- Move preload.lisp files to the main package + * Mon Aug 8 2022 Jerry James loganjerry@gmail.com - 2.49.93-25 - Add -ensure-6x patch (rhbz#2115476)
commit 4be1418d1423f5fe07633ceed0855bc276be5e6a Author: Jerry James loganjerry@gmail.com Date: Mon Aug 8 13:07:28 2022 -0600
Add -ensure-6x patch (rhbz#2115476).
diff --git a/clisp-ensure-6x.patch b/clisp-ensure-6x.patch new file mode 100644 index 0000000..5c9207d --- /dev/null +++ b/clisp-ensure-6x.patch @@ -0,0 +1,11 @@ +--- modules/syscalls/calls.c.orig 2021-06-28 14:32:42.000000000 -0600 ++++ modules/syscalls/calls.c 2022-08-04 13:21:10.461997402 -0600 +@@ -677,7 +677,7 @@ DEFUN(OS:VERSION>=, string1 string2){VAL + && name[name##_bytelen-6]=='X') { \ + c_template = name; \ + } else { \ +- c_template = (char*)alloca(name##_bytelen+6); \ ++ c_template = (char*)alloca(name##_bytelen+7); \ + strcpy(c_template,name); \ + strcat(c_template,"XXXXXX"); \ + } diff --git a/clisp.spec b/clisp.spec index 05338ec..984e5b7 100644 --- a/clisp.spec +++ b/clisp.spec @@ -16,7 +16,7 @@ Version: 2.49.93
%forgemeta
-Release: 24%{?dist} +Release: 25%{?dist} License: GPLv2+ URL: http://www.clisp.org/ Source0: %{forgesource} @@ -41,6 +41,10 @@ Patch4: %{name}-pts-access.patch # Work around a problem inlining a function on ppc64le # See https://bugzilla.redhat.com/show_bug.cgi?id=2049371 Patch5: %{name}-no-inline.patch +# The ENSURE_6X macro adds 6 'X' characters to a string. However, it allocates +# only 6 bytes more than the length of the string, which is not enough for the +# null terminator. See https://bugzilla.redhat.com/show_bug.cgi?id=2115476. +Patch6: %{name}-ensure-6x.patch
BuildRequires: dbus-devel BuildRequires: diffutils @@ -122,6 +126,7 @@ Files necessary for linking CLISP programs. %ifarch %{power64} %patch5 -p0 %endif +%patch6 -p0 cp -p %{SOURCE1} emacs cp -p %{SOURCE2} %{SOURCE3} src/po
@@ -430,6 +435,9 @@ make -C build base-mod-check
%changelog +* Mon Aug 8 2022 Jerry James loganjerry@gmail.com - 2.49.93-25 +- Add -ensure-6x patch (rhbz#2115476) + * Wed Jul 20 2022 Fedora Release Engineering releng@fedoraproject.org - 2.49.93-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
commit bf061dddccb604c1b30dfd6cfd098eda9e35b538 Author: Fedora Release Engineering releng@fedoraproject.org Date: Wed Jul 20 23:06:37 2022 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/clisp.spec b/clisp.spec index b621577..05338ec 100644 --- a/clisp.spec +++ b/clisp.spec @@ -16,7 +16,7 @@ Version: 2.49.93
%forgemeta
-Release: 23%{?dist} +Release: 24%{?dist} License: GPLv2+ URL: http://www.clisp.org/ Source0: %{forgesource} @@ -430,6 +430,9 @@ make -C build base-mod-check
%changelog +* Wed Jul 20 2022 Fedora Release Engineering releng@fedoraproject.org - 2.49.93-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jul 18 2022 Jerry James loganjerry@gmail.com - 2.49.93-23 - Reduce the impact of the -no-inline patch
commit 7d5ddf7eb7a1e08a7a6bb36fd5f3c8ace9e987f8 Author: Jerry James loganjerry@gmail.com Date: Mon Jul 18 11:09:08 2022 -0600
Reduce the impact of the -no-inline patch. Add README.md.
diff --git a/README.md b/README.md new file mode 100644 index 0000000..e2490fd --- /dev/null +++ b/README.md @@ -0,0 +1,22 @@ +# clisp + +[ANSI Common Lisp](http://www.lispworks.com/documentation/HyperSpec/Front/) is +a high-level, general-purpose programming language. +[GNU CLISP](https://clisp.sourceforge.io/) is a Common Lisp implementation by +Bruno Haible of Karlsruhe University and Michael Stoll of Munich University, +both in Germany. It mostly supports the Lisp described in the ANSI Common +Lisp standard. It runs on most Unix workstations (GNU/Linux, FreeBSD, NetBSD, +OpenBSD, Solaris, Tru64, HP-UX, BeOS, NeXTstep, IRIX, AIX and others) and on +other systems (Windows NT/2000/XP, Windows 95/98/ME) and needs only 4 MiB of +RAM. + +It is Free Software and may be distributed under the terms of GNU GPL, while +it is possible to distribute commercial proprietary applications compiled with +GNU CLISP. + +The user interface comes in English, German, French, Spanish, Dutch, Russian +and Danish, and can be changed at run time. GNU CLISP includes an +interpreter, a compiler, a debugger, CLOS, MOP, a foreign language interface, +sockets, i18n, fast bignums and more. An X11 interface is available through +CLX, Garnet, CLUE/CLIO. GNU CLISP runs Maxima, ACL2 and many other Common +Lisp packages. diff --git a/clisp-no-inline.patch b/clisp-no-inline.patch index bd47c52..f4e54b9 100644 --- a/clisp-no-inline.patch +++ b/clisp-no-inline.patch @@ -1,12 +1,11 @@ ---- src/makemake.in.orig 2021-06-28 14:32:42.000000000 -0600 -+++ src/makemake.in 2022-02-02 19:48:37.880723176 -0700 -@@ -3055,6 +3055,9 @@ for f in $CPARTS genclisph modules $EXTR - # "1252-171 The displacement must be greater than or equal to -32768 and less than or equal to 32767." - flags2=$flags2' -O1' - fi -+ if [ $f = foreign ] && [[ $HSYS =~ ppc64le ]] ; then -+ flags2=$flags2' -fno-inline-small-functions' -+ fi - echol "${f}.i : ${c}${dependsc}" - echotab "${XCPP} ${flags} ${c} > ${f}.i" - echol +--- src/foreign.d.orig 2021-06-28 14:32:42.000000000 -0600 ++++ src/foreign.d 2022-02-03 21:52:22.932176743 -0700 +@@ -2417,7 +2417,7 @@ local void count_walk_post (object fvd, + { + unused(fvd); unused(obj); unused(walk); + } +-local maygc void convert_to_foreign_needs (object fvd, object obj, ++local maygc __attribute__((noinline)) void convert_to_foreign_needs (object fvd, object obj, + struct foreign_layout *sas) + { + struct walk_lisp walk diff --git a/clisp.spec b/clisp.spec index fec5a1d..b621577 100644 --- a/clisp.spec +++ b/clisp.spec @@ -114,7 +114,14 @@ Files necessary for linking CLISP programs.
%prep %forgesetup -%autopatch -p0 +%patch0 -p0 +%patch1 -p0 +%patch2 -p0 +%patch3 -p0 +%patch4 -p0 +%ifarch %{power64} +%patch5 -p0 +%endif cp -p %{SOURCE1} emacs cp -p %{SOURCE2} %{SOURCE3} src/po
@@ -423,6 +430,9 @@ make -C build base-mod-check
%changelog +* Mon Jul 18 2022 Jerry James loganjerry@gmail.com - 2.49.93-23 +- Reduce the impact of the -no-inline patch + * Thu Feb 3 2022 Jerry James loganjerry@gmail.com - 2.49.93-23 - Add -no-inline patch to workaround bz 2049371 (ppc64le segfault)
arch-excludes@lists.fedoraproject.org