debian/0000775000000000000000000000000012317455607007202 5ustar debian/changelog0000664000000000000000000012357712317455307011070 0ustar clisp (1:2.49-9ubuntu1) trusty; urgency=medium * Remove positive build-depends for s390x. Fixes ftbfs. LP: #1264891 -- Jackson Doak Thu, 03 Apr 2014 07:41:26 +1100 clisp (1:2.49-9) unstable; urgency=medium * Enable FFI on arm* * Import patch from Roland Stigge adding support for powerpcspe (Closes: #731648) -- Christoph Egger Mon, 23 Dec 2013 20:21:22 +0100 clisp (1:2.49-8.2) unstable; urgency=low * Non-maintainer upload. * Add armhf to architecture lists * Build with -marm on armhf due to thumb incompatible code (specifically code that does not like odd function pointers) * apply patch from sourceforce to fix illegal instruction error on newer arm hardware caused by arm assembler (thanks to jerry james and tomfor) (closes: 684631) * Fix build errors with eglibc 2.17 (closes: 701379) -- Peter Michael Green Tue, 07 May 2013 20:39:13 +0000 clisp (1:2.49-8.1) unstable; urgency=low * Non-maintainer upload. * Build depend on libdb-dev instead of libdb4.8-dev. Add new patch to reflect the fact that Berkeley DB 5.1 no longer supports RPC. (Closes: #621377) -- Sébastien Villemot Fri, 17 Feb 2012 14:23:49 +0100 clisp (1:2.49-8) unstable; urgency=low * Replace dependency on libreadline5-dev with libreadline-gplv2-dev to follow that sensless rename * Import path from Robert Millan to support kfreebsd-amd64 as well (Closes: #633454) -- Christoph Egger Wed, 13 Jul 2011 05:21:23 +0200 clisp (1:2.49-7) unstable; urgency=low * Apply a workaround potentially fixing the s390 problem * Output some more info in case the above doesn't work -- Christoph Egger Fri, 08 Apr 2011 23:43:02 +0200 clisp (1:2.49-6) unstable; urgency=low * Output config.log from where it exists -- Christoph Egger Mon, 04 Apr 2011 18:24:29 +0200 clisp (1:2.49-5) unstable; urgency=low * Output config log on failed builds to debug s390 build failure -- Christoph Egger Mon, 04 Apr 2011 16:27:09 +0200 clisp (1:2.49-4) unstable; urgency=low * Adapt package to broken new dh-lisp version. Autobuilders should now produce working packages again. -- Peter Van Eynde Thu, 17 Mar 2011 10:28:01 +0100 clisp (1:2.49-3) unstable; urgency=low * Declare a conflict between clisp and clisp-dev to catch overwriting clisp-link. Missed that during testing. (Closes: #614889) -- Peter Van Eynde Fri, 18 Feb 2011 05:44:09 +0100 clisp (1:2.49-2) unstable; urgency=low [ Peter Van Eynde ] * Updated debian/README.building with updated information * 2.49 also fixes a bug related to store-value. (Closes: #607743) * Go with the flow and convert to use quilt * Building for release with branch debian-2.49-2 [ Luca Capello ] * debian/control: + remove myself from Uploaders:. [ Peter Van Eynde ] * Move new-clx demos to the documentation -- Peter Van Eynde Thu, 17 Feb 2011 20:38:32 +0100 clisp (1:2.49-1) experimental; urgency=low * Use libsigsegv 2.8 should fix a few issues. (Closes: 566686) * conflict against libreadline6 as it would be illegal to link against that. (Closes: 553741) * Use bash for clisp-link (Closes: #530054) * New upstream version (Closes: #462742)3 * Redid debianization from scratch. (Closes: #504514,#177057,#462085, #488042, #462088, #433592, #433596) * Dropped conflicts with ancient versions of clisp. * Changed build system on powerpc, the resulting image passes all tests, so should Closes: #592768 * We got a fix the 'file with wrong *pathname-encoding* in ~/' bug. (Closes: #443520) * Fix the build on Sparc by disabling FFI and dynamic modules completely. -- Peter Van Eynde Tue, 28 Sep 2010 07:31:59 +0200 clisp (1:2.48-3) unstable; urgency=medium * Re-Add s390 to -doc's architectures, was removed by accident * Replace arm by armel in debian/control * urgency=medium due to rc bug fix and asdf/clc transition waiting for it * Upgrade to source 1.0 -- Christoph Egger Wed, 07 Jul 2010 23:40:17 +0200 clisp (1:2.48-2) unstable; urgency=low [ Peter Van Eynde ] * forgot to change clisp-dev to lisp section * Fixed bdb.c to handle new berkely-db version (Closes: #549762) [ Christoph Egger ] * Pass --build to all ./configure runs (Closes: #546355) * Upload * Apply build parameters from arm also to armel * Add myself to uploaders -- Christoph Egger Sun, 04 Jul 2010 13:26:01 +0200 clisp (1:2.48-1.2) unstable; urgency=low * Non-maintainer upload. * Add "Breaks: cl-asdf (<< 2:1.704-1)" (Closes: #579460) -- Alexander Reichle-Schmehl Wed, 05 May 2010 10:39:00 +0200 clisp (1:2.48-1.1) unstable; urgency=low * Non-maintainer upload. * Build depend on libdb4.7-dev as proposed by Ilya Barygin (Closes: #549762) -- Alexander Reichle-Schmehl Fri, 23 Apr 2010 11:25:30 +0200 clisp (1:2.48-1) unstable; urgency=low * New upstream release * move clisp-link patch into git repository * Moved instructionset definition patch into git. * removed quilt horror * Updated Standards-Version no real changes * Changed Section to lisp * go to debhelper v7 * added build conflict against libsigsegv 2.7 and higher * updated doc directory that gets build by upstream * added ${misc:Depends} to Depends * updated copyright file * Changed makemake to not use identical temporary targets a few times, (Closes: #494413) * Make clisp-link always work with bash. Closes: #530054 * Fix bashism in clisp.sh Closes: #530055 * Added debian/README.building file * added conflict with older clc -- Peter Van Eynde Thu, 03 Sep 2009 04:52:49 +0100 clisp (1:2.44.1-4.1) unstable; urgency=low * Non-maintainer upload. * Readd s390 support. * Remove host instructionset definition, regenerate src/configure. (closes: #488817) -- Bastian Blank Sun, 10 Aug 2008 09:28:14 +0000 clisp (1:2.44.1-4) unstable; urgency=low * debian/control: - drop s390 support, it seems it really needs ./configure --build. -- Luca Capello Wed, 23 Jul 2008 19:50:10 +0200 clisp (1:2.44.1-3) unstable; urgency=low * doc/_clisp.1: - restore upstream version, modifications to upstream files must be managed through a Debian-specific patch system. * doc/faq.xml: - restore upstream version, modifications to upstream files must be managed through a Debian-specific patch system. * debian/clisp-doc.install: + correct install path. * debian/clisp-dev.install: + install clisp-link manpage. * debian/clisp.install: + install clisp manpage. * debian/control: + build-depend on quilt to manage patches. - remove libxt-dev from clisp Build-Depends: and clisp-dev Depends:, they are not used and generate unnecessary library inclusions in clisp-dev makevars, thanks to Jörg Sommer (Closes: #462087). * debian/dirs: - remove, useless. * debian/patches/series: new file. * debian/patches/01_fix-comment-in-src-ariarm.d.patch: + fix FTBFS: backport upstream fix (Closes: #490944). * debian/patches/02_add-clisp-link-manpage.patch: + first version for the clisp-link manpage. * debian/rules: + fix FTBFS: since backporting the upstream support for standard autoconf options (--build and --host) is too much a pain, add a `export CC=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)-gcc`, thanks to Bastian Blank (Closes: #488817). + adapt to quilt. - remove unwanted upstream doc/ files on 'install' target. - remove useless dh_installman call from 'binary-indep' target. -- Luca Capello Mon, 21 Jul 2008 02:14:29 +0200 clisp (1:2.44.1-2) unstable; urgency=low * debian/control: + add libdb-dev to clisp-dev Depends:, thanks to Jörg Sommer (Closes: #462086). + add libffcall1-dev to clisp-dev Depends:, thanks to Jörg Sommer (Closes: #468090). * debian/rules: + fix FTBFS: allow 'MAKEFLAGS=-jN', thanks to Albin Tonnerre for the patch (Closes: #487381). -- Luca Capello Wed, 09 Jul 2008 17:25:15 +0200 clisp (1:2.44.1-1) unstable; urgency=low * New bugfix Upstream Version: + Add a workaround against a gcc 4.2.x bug [ 1836142 ]. + Make it work with gcc 4.3 snapshots [ 1836142 ] fix Debian FTBFS, thank Sebastian Bober for having discovered it (Closes: #474810). * debian/clisp*.install: + replace 2.44 with 2.44.1 to reflect the new upstream version. * debian/clisp.sh: + replace 2.44 with 2.44.1 to reflect the new upstream version. * debian/control: + add myself to Uploaders:. + add Vcs-Browser field. - remove xutils from Build-Depends: and clisp-dev Depends:. - remove trailing space and line. * debian/preinst: + replace 2.44 with 2.44.1 to reflect the new upstream version. - remove trailing spaces. * debian/postrm: + replace 2.44 with 2.44.1 to reflect the new upstream version. - remove trailing spaces. * debian/rules: + replace 2.44 with 2.44.1 to reflect the new upstream version. - remove suspicious line. - remove trailing spaces. - do not try to change permissions for ffcall/configure, since GNU libffcall is no more included since version 2.44. - do not try to change permissions for libcharset/configure, since GNU libffcall is no more included since version 2.43 (its use has been replaced by gnulib/localcharset) -- Luca Capello Thu, 19 Jun 2008 20:52:36 +0200 clisp (1:2.44-1) unstable; urgency=low * New Upstream Version Major changes: * CLISP does not come with GNU libffcall anymore. This is now a separate package and should be installed separately. * CLOS now issues warnings of type CLOS:CLOS-WARNING. See for details. * Speed up list and sequence functions when : TEST is EQ, EQL, EQUAL or EQUALP. * Rename EXT:DELETE-DIR, EXT:MAKE-DIR, and EXT:RENAME-DIR to EXT:DELETE-DIRECTORY, EXT:MAKE-DIRECTORY, and EXT:RENAME-DIRECTORY, respectively, for consistency with EXT:PROBE-DIRECTORY, EXT:DEFAULT-DIRECTORY and CL:PATHNAME-DIRECTORY. The old names are still available, but deprecated. * The :VERBOSE argument to SAVEINITMEM defaults to a new user variable *SAVEINITMEM-VERBOSE*, intial value T. See for details. * Bug fixes: + Fix FRESH-LINE at the end of a line containing only TABs. [ 1834193 ] + PPRINT-LOGICAL-BLOCK no longer ignores *PRINT-PPRINT-DISPATCH-TABLE*. [ 1835520 ] + BYTE is now a full-fledged type. [ 1854698 ] + Fix linux:dirent definition in the bindings/glibc module. [ 1779490 ] + Symbolic links into non-existent directories can now be deleted. [ 1860489 ] + DIRECTORY :FULL on directories now returns the same information as on files. [ 1860677 ] + CLISP no longer hangs at the end of a script coming via a pipe ("clisp < script.lisp" or "cat script | clisp"). [ 1865567 ] + When *CURRENT-LANGUAGE* is incompatible with *TERMINAL-ENCODING*, CLISP no longer goes into an infinite recursion trying to print various help messages. [ 1865636 ] + Fix the "Quit" debugger command. [ 1448744 ] + Repeated terminating signals kill CLISP instantly with the correct exit code. [ 1871205 ] + Stack inspection is now safer. [ 1506316 ] + Errors in the RC-file and init files are now handled properly. [ 1714737 ] + Avoid the growth of the restart set with each image save. [ 1877497 ] + Handle foreign functions coming from the old image which cannot be validated. [ 1407486 ] + Fix signal code in bindings/glibc/linux.lisp. [ 1781476 ] -- Peter Van Eynde Mon, 18 Feb 2008 06:36:09 +0100 clisp (1:2.43-2) unstable; urgency=low * now using git * Fixed Vcs-Git entry * Changed to group maintanance * updated standard version no real changes * added watch file -- Peter Van Eynde Wed, 19 Dec 2007 11:01:26 +0100 clisp (1:2.43-1) unstable; urgency=low * New upstream release. * removed the lisp-* hack, use real version in all scripts (Closes: #450452) * Use default gcc again * Fixed dpkg warnings about "unable to delete old directory `/usr/lib/clisp" (Closes: #448431) * Added support for module berkeley-db (Closes: #443804) -- Peter Van Eynde Thu, 13 Dec 2007 05:31:23 +0100 clisp (1:2.42-3) unstable; urgency=low * Forgot to regenerate configure script. 2.42 for real this time! -- Peter Van Eynde Fri, 26 Oct 2007 23:41:53 +0200 clisp (1:2.42-2) unstable; urgency=low * Fix glob expansion * Fix clisp version number. -- Peter Van Eynde Fri, 26 Oct 2007 06:11:54 +0200 clisp (1:2.42-1) unstable; urgency=low * New upstream version. * added hurd-i386 to architectures (Closes: #434719) * Use Vcs-Bzr in control file * clisp now uses /usr/lib/clisp- -- Peter Van Eynde Fri, 26 Oct 2007 05:13:42 +0200 clisp (1:2.41-2) unstable; urgency=low * Fixed XS-Vcs-Bzr item in the control file. * Added hurd-i386 support. (Closes: #409827, #409827) -- Peter Van Eynde Fri, 14 Sep 2007 11:16:12 +0200 clisp (1:2.41-1) unstable; urgency=low * updated XS-Vcs-Svn field * New upstream release. Mostly bugfixes and: - New module libsvm interface - The same internal interface now handles FFI forms DEF-CALL-OUT and DEF-C-VAR regardless of the presence of the :LIBRARY argument. -- Peter Van Eynde Fri, 13 Oct 2006 15:19:48 +0200 clisp (1:2.40-2) unstable; urgency=low * Included documentation patch from https://sourceforge.net/tracker/?func=detail&atid=101355&aid=1569234&group_id=1355 * Fix FTBFS on ia64 by not using -O2 when compiling. Stable gcc, isn't it? * On second thoughts, let us try if doing this also helps sparc and mipsel. -- Peter Van Eynde Wed, 4 Oct 2006 18:10:31 +0200 clisp (1:2.40-1) unstable; urgency=low * New upstream version. * Don't run test anymore as they make the build fail hard. * Fixed clisp manual page -- Peter Van Eynde Mon, 2 Oct 2006 14:43:30 +0200 clisp (1:2.39-3) unstable; urgency=medium * Disable FFI on mipsel, fixes the FTBFS. * Ignore the results of running the tests because the network stack is sometimes not correct on the buildd daemons (localhost does not resolve). We still do run the tests and we will review the output of the buildd daemons for 'real' problems. Fixes the FTBFS for amd64, hppa. (Closes: 388752) * Added XS-X-Vcs-Darcs header -- Peter Van Eynde Mon, 25 Sep 2006 07:57:43 +0200 clisp (1:2.39-2) unstable; urgency=low * Don't use -O0 anymore for ia64, hint from Dr. Werner Fink at suse.de * Run tests after building the clisp. * Drop support for sparc. Not having a machine to test sparc problems on just makes it too difficult to support. I hope not many users will be impacted. (Closes: #386075) -- Peter Van Eynde Wed, 20 Sep 2006 10:41:00 +0200 clisp (1:2.39-1) unstable; urgency=low * Included patch from Thiemo Seufer to re-enable FFI for mips/mipsel. Closes: #377722 * New upstream. Highlights of this new version: - SAVEINITMEM now accepts :SCRIPT argument - FFI:UINT64 and FFI:SINT64 are now compatible with C's long long type. - Stack overflow detection and recovery finally work fine on Unix. - It is now possible to specify the default method-combination of a generic function, - Readline completion works with non 1:1 terminal encodings, e.g. UTF-8. - WITH-KEYBOARD works with a Unix tty even when SLIME hijacks *TERMINAL-IO*. - New functions: POSIX:FFS, POSIX:PATHCONF. - Bug fixes: + SOCKET:SOCKET-SERVER :INTERFACE now behaves as documented. + EXT:READ-BYTE-NO-HANG and SOCKET:SOCKET-STATUS used to hang on buffered binary sockets. + Allow DESTRUCTURING-BIND (a . b) with circular and dotted lists. + ADJUST-ARRAY of zero length adjustable string now works. + TIME now reports correct results when the heap grows over 4GB. + RAWSOCK functions now handle :START/:END arguments correctly. + BDB:DBC-GET now accepts :READ-COMMITTED and :READ-UNCOMMITTED. + POSIX:GROUP-INFO and POSIX:USER-INFO now handle errors correctly. * Use CFLAGS as configure now respects this. * Fixed clisp.1 manual page, it had '.sp \-1'. -- Peter Van Eynde Fri, 28 Jul 2006 06:07:21 +0200 clisp (1:2.38-8) unstable; urgency=low * Depend on new libsigsegv-dev version -- Peter Van Eynde Sun, 2 Jul 2006 23:48:29 +0200 clisp (1:2.38-7) unstable; urgency=low * Depend on non-broken libsigsegv-dev * use -O0 on ia64 -- Peter Van Eynde Sun, 2 Jul 2006 00:21:02 +0200 clisp (1:2.38-6) unstable; urgency=low * Force ia64 to compile with -O0, this seems to fix the crashes when using gcc-4.1. Closes: #373697 * For the same bug: we now undef unused before including signal.h because unused is used in the user_fpregs struct on arm. Should fix FTBFS on arm. * Make configure and other scripts executable on clean -- Peter Van Eynde Sat, 17 Jun 2006 22:02:06 +0200 clisp (1:2.38-5) unstable; urgency=low * Added support for GNU/kFreeBSD (Closes: #366143) * Updated standard version without real changes. -- Peter Van Eynde Mon, 15 May 2006 00:57:39 +0200 clisp (1:2.38-4) unstable; urgency=low [Peter Van Eynde] * Redid Depends for clisp, this should fix the FTBFS probems for mcvs. (Closes: #346164) * Use newer libsigsegv * Try to rebuild for m68k. * Updated standards version without real changes. [René van Bevern] * debian/control: remove dependency on "common-lisp-controller (>= 4.27)", it is added by dh-lisp and should not resoult in a double dependency -- Peter Van Eynde Tue, 2 May 2006 20:00:32 +0200 clisp (1:2.38-3) unstable; urgency=low * Build with gcc-4.1, should fix: Closes: #344525, #349229. * Also support GNU/kFreeBSD. Closes: #342640 * Removed build-essential dependency of clisp-dev and replaced it with the used packages. -- Peter Van Eynde Thu, 13 Apr 2006 16:23:56 +0200 clisp (1:2.38-2) unstable; urgency=low * Integrated ubuntu patches from Stefan Potyra : + Adding a small patch to debian/rules to substitue the dependency on gcc-3.3 on these architectures for clisp-dev (with a variable in debian/control). + Add -falign-functions=4 to CFLAGS to fix FTBFS on AMD64. See: https://launchpad.net/products/clisp/+bug/6511 + Change Predepends of xlibs to libx11-6 libxext6 libxpm4 * rebuild with updated libsigsegv. -- Peter Van Eynde Wed, 15 Mar 2006 17:53:13 +0100 clisp (1:2.38-1) unstable; urgency=low * New upstream. * Maybe amd64 will work with gcc-3.3? Is a working debian host to test this on not nice? Sigh. We will see if it fails again. Seeing the logs would help. Thanks to Ubuntu to actually have the buildd logs available. * As it is impossible to have a dependency on gcc-3.3 only for some architectures, have _all_ of them depend on gcc-3.3, but add build-essential for all other architectures. * Fixed Build-dep on libreadline-dev (Closes: #351339) -- Peter Van Eynde Sat, 4 Feb 2006 12:54:43 +0100 clisp (1:2.36-4) unstable; urgency=low * fix for: 'ERROR: Package builds clisp-doc_2.36-3_all.deb when binary-indep target is not called. This is a bug in the packaging' * use v9 sparc as cpu, as the assembler requires this. -- Peter Van Eynde Fri, 20 Jan 2006 09:43:33 +0100 clisp (1:2.36-3) unstable; urgency=low * expanded xlibs-dev build-depends (Closes: #346649) * Added ia64 to FFI-less architectures (Closes: #346217) -- Peter Van Eynde Tue, 17 Jan 2006 14:22:55 +0100 clisp (1:2.36-2) unstable; urgency=low * Add build-depends on xutils,libxt-dev (Closes: #342552) * added kfreebsd-i386 to the architecture list (Closes: #342640) * disable FFI on ia64 because it doesn't build correctly -- Peter Van Eynde Fri, 9 Dec 2005 16:42:20 +0100 clisp (1:2.36-1) unstable; urgency=low * New upstream version. * Improved errorchecking during installation, made removal more failsave. Closes: #340274 * Improved error propagation during installation, should signal all errors to clc now. Should fix these strange problems we've been seeing. Closes: #340274, #340646 * Try gcc on sparc, could Closes: #341850 * Could not get it to work on m68k. Upstream also does not test anymore on this architecture, so for all pratical purposes the port is dead. Patches welcome. Closes: #162019, #62116, #64853 * Improved package descriptions. -- Peter Van Eynde Thu, 8 Dec 2005 08:16:40 +0100 clisp (1:2.35-9) unstable; urgency=low * fixed dependency on common-lisp-controller. Forgot to add ${misc:Depends} to the control file! Closes: #340250 * Removed Conflict between clisp and clisp-dev, clisp-doc as to avoid sbcl-like build problems. * Added suggest for slime. -- Peter Van Eynde Thu, 24 Nov 2005 07:21:17 +0100 clisp (1:2.35-8) unstable; urgency=low * Corrected the conflicts of the sub-packages. * Removed unrequired patches from the sources * Simplified creation of mem files: now the original file is always left in place, and a new file with clc in created on install. -- Peter Van Eynde Sat, 5 Nov 2005 23:38:58 +0100 clisp (1:2.35-7) unstable; urgency=low * So with gcc-4 on sparc we got the pretty impressive: ;; Loading file defs1.lisp ... *** - quotient GGGGGGGG0GGGGGGGG0GGGGGGGG0GGGGGGGG\ 0GGGGGGGG0GGGGGGGG0GGGGGGGG / GGGGGGGG\ is not an integer Now on m68k we get the even more impressive: cat '/build/buildd/clisp-2.35/src/intparam.c' >> tmp.c gcc -D SAFETY=3 -D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE \ -D NO_SINGLEMAP -D NO_TRIVIALMAP tmp.c -o intparam tmp.c: In function 'main5': tmp.c:422: internal compiler error: in instantiate_virtual_regs_lossage, at function.c:1442 So we're going to use gcc-3.3 for both architectures and hope that upstream or the gcc maintainers get this one right. Change: also use gcc-3.3 for m68k. -- Peter Van Eynde Sat, 29 Oct 2005 16:55:28 +0200 clisp (1:2.35-6) unstable; urgency=low * On sarge on sparc at least clisp does compile with gcc-3.3 so we force to use 3.3 on sparc. Should Closes: #321177 * Use ${Source-Version} to force packages to upgrade together. * clisp now suggests clisp-dev, but we should still provide a better description of what clisp-dev exactly does and why one would need to install it. Never mind writing a man page for clisp-link. Closes: #329919 -- Peter Van Eynde Sat, 29 Oct 2005 08:37:28 +0200 clisp (1:2.35-5) unstable; urgency=low * Removed patching of source, I prefer to use darcs * Safer compilation settings for the more exotic architectures. They seem to work in interactive testing, let us see on the buildd's. -- Peter Van Eynde Tue, 25 Oct 2005 15:09:49 +0200 clisp (1:2.35-4) unstable; urgency=low * configure gets rerun gratuitiously (Closes: #334234) * Added build-depends on a new version of dh-lisp, to avoid FTBS. * Again use gcc 4.0 on all platforms. Hint of Thiemo Seufer -- Peter Van Eynde Fri, 21 Oct 2005 23:40:24 +0200 clisp (1:2.35-3) unstable; urgency=low * Updated FSF address * New maintainer. (Closes: #330076: RFA: clisp -- GNU CLISP, a Common Lisp implementation - Debian Bug report logs) * Added dependency for quilt -- Peter Van Eynde Mon, 17 Oct 2005 23:00:37 +0200 clisp (1:2.35-2) unstable; urgency=low * Fix FTBFS caused by charset encoding of fasl version code. -- Will Newton Tue, 13 Sep 2005 19:58:33 +0100 clisp (1:2.35-1) unstable; urgency=low * New upstream version. * Update description. * Add support for providing the fasl version, thanks to Rene van Bevern. -- Peter Van Eynde Mon, 10 Oct 2005 10:00:02 +0200 clisp (1:2.34-5) unstable; urgency=low * More build fixes for CLX. -- Will Newton Thu, 11 Aug 2005 21:58:31 +0100 clisp (1:2.34-4) unstable; urgency=low * Patch from upstream CVS to fix MIT CLX build. * Fix previous mips fix. -- Will Newton Wed, 10 Aug 2005 20:55:35 +0100 clisp (1:2.34-3) unstable; urgency=low * Further build fixes for arm and mips. -- Will Newton Tue, 9 Aug 2005 20:22:38 +0100 clisp (1:2.34-2) unstable; urgency=low * Fix clisp-dev readline depends. * Add build-dep on xutils. (Closes: #321045) * Fixes for build on mips, mipsel and arm. -- Will Newton Mon, 8 Aug 2005 19:46:27 +0100 clisp (1:2.34-1) unstable; urgency=low * New upstream version. (Closes: #163875, #319974) - Now includes MOP support. - Better ANSI CL compliance. * Bump standards version to 3.6.2. * Use quilt for patch management. * Try gcc 4.0 on all platforms. -- Will Newton Sat, 2 Jul 2005 15:18:20 +0100 clisp (1:2.33.2-10) unstable; urgency=low * Build dep on gcc 2.95 on mipsel. -- Will Newton Wed, 23 Feb 2005 00:00:19 +0000 clisp (1:2.33.2-9) unstable; urgency=low * Actually enable FFI on mipsel. -- Will Newton Sun, 20 Feb 2005 15:19:15 +0000 clisp (1:2.33.2-8) unstable; urgency=low * Acknowledge NMU (Closes: #283171). Thanks Frank! * Add patches from Thiemo Seufer to get FFI working on mips/mipsel. * Fix URLs in READMEs (Closes: #296000). * Build Depend on libreadline5-dev. -- Will Newton Sun, 20 Feb 2005 13:40:24 +0000 clisp (1:2.33.2-7.1) unstable; urgency=high * NMU * Disable FFI on mipsel again, just doesn't seem to work (Closes: #283171) -- Frank Lichtenheld Sat, 5 Feb 2005 15:25:35 +0100 clisp (1:2.33.2-7) unstable; urgency=low * Fix build so aclocal is not called unnecessarily (Closes: #272670). -- Will Newton Wed, 22 Sep 2004 23:29:07 +0100 clisp (1:2.33.2-6) unstable; urgency=low * Further mipsel fixing, try and get it right this time. * Make clisp-dev depend on gcc-2.95 on mips/mipsel (Closes: #272550). - Thanks to Robin Verduijn. -- Will Newton Mon, 20 Sep 2004 22:18:31 +0100 clisp (1:2.33.2-5) unstable; urgency=low * Add support for FFI on mipsel. -- Will Newton Fri, 17 Sep 2004 19:59:02 +0100 clisp (1:2.33.2-4) unstable; urgency=low * Fix FFI for mips (Closes: #200400). - Thanks to Thiemo Seufer. -- Will Newton Wed, 15 Sep 2004 21:25:19 +0100 clisp (1:2.33.2-3) unstable; urgency=low * Fix FFI for ia64 (Closes: #200245, #269556). -- Will Newton Mon, 6 Sep 2004 23:34:53 +0100 clisp (1:2.33.2-2) unstable; urgency=low * Add common-lisp-controller v4 support (Closes: #263009). - Thanks to Kevin M. Rosenberg. -- Will Newton Sat, 14 Aug 2004 17:05:07 +0100 clisp (1:2.33.2-1) unstable; urgency=low * New upstream version. * Fix build on alpha (Closes: #253679). -- Will Newton Wed, 9 Jun 2004 20:15:44 +0100 clisp (1:2.33.1-1) unstable; urgency=low * New upstream version. * Split out clisp-dev package (Closes: #249914). -- Will Newton Sun, 23 May 2004 12:16:25 +0100 clisp (1:2.33-2) unstable; urgency=medium * Build fixes for alpha, arm and hppa. * Updated description. -- Will Newton Wed, 24 Mar 2004 19:25:50 +0000 clisp (1:2.33-1) unstable; urgency=low * New upstream release. * Fixes build on 64bit userland. (Closes: #221242) -- Will Newton Tue, 23 Mar 2004 14:02:36 +0000 clisp (1:2.32.94-1) unstable; urgency=low * Pre-release of 2.33. * Merging of many patches upstream. -- Will Newton Mon, 15 Mar 2004 17:38:36 +0000 clisp (1:2.32-7) unstable; urgency=low * Further purging of preprocessor pasting to appease gcc. * Workaround gcc bug with asm constraints on m68k. * Declare Pre-Depends (ick) on xlibs. (Closes: #228629) -- Will Newton Thu, 19 Feb 2004 20:32:10 +0000 clisp (1:2.32-6) unstable; urgency=low * Remove Suggests: xlibs, shlibdeps does the right thing. * Fix libsigsegv usage on arm. * Set LD_LIBRARY_PATH so we can find X libs in postinst. (Closes: #228629) * Do not unconditionally purgew all of /usr/lib/clisp. (Closes: #230177) -- Will Newton Thu, 29 Jan 2004 18:04:08 +0000 clisp (1:2.32-5) unstable; urgency=low * Add Suggests: gdb and a note in README.Debian mentioning that using the disassemble function requires gdb installed. * Shuffle declaration in lispbibl.d to fix arm build. * Disable FFI on ia64 to fix FTBFS. (Closes: #224462) * Add a missing typecode guard to fix build on 64bit arches. -- Will Newton Mon, 19 Jan 2004 20:44:17 +0000 clisp (1:2.32-4) unstable; urgency=low * OK, I give in. Try disabling typecodes on all arches. -- Will Newton Thu, 15 Jan 2004 00:39:24 +0000 clisp (1:2.32-3) unstable; urgency=low * Fix for typecodes build (ia64, alpha). -- Will Newton Mon, 5 Jan 2004 21:57:11 +0000 clisp (1:2.32-2) unstable; urgency=low * Reintroduce mips build fix. -- Will Newton Sat, 3 Jan 2004 13:44:49 +0000 clisp (1:2.32-1) unstable; urgency=low * New upstream version. * new-clx module supports X authentication (Closes: #166094) * clisp.h no longer includes non-existant files (Closes: #216971) * Symlink clisp-link into /usr/bin (Closes: #175974) * Current cl-asdf seems to work fine (Closes: #197029) -- Will Newton Thu, 1 Jan 2004 22:30:57 +0000 clisp (1:2.31-4) unstable; urgency=low * Removed Build-Conflicts. * Build depend on new version of libsigsegv-dev. * Add Conflicts on old versions of clisp-doc. (Closes: #211873) * Rebuild against new libc6 and libsigsegv. - Should fix hppa build (Closes: #199025) -- Will Newton Mon, 22 Sep 2003 09:23:29 +0100 clisp (1:2.31-3) unstable; urgency=low * Fix build without dynamic ffi. * Add Build-Conflicts on broken libc6-dev. * Add fix for ppc build. -- Will Newton Mon, 8 Sep 2003 13:19:31 +0100 clisp (1:2.31-2) unstable; urgency=low * Really don't build ffcall on unsupported arches. * Add mips to list of unsupported arches. -- Will Newton Fri, 5 Sep 2003 09:54:53 +0100 clisp (1:2.31-1) unstable; urgency=low * New upstream version. * Bumped DH_COMPAT to 4. * Bumped standards version to 3.6.1. * Cleaned up build process. -- Will Newton Thu, 4 Sep 2003 18:14:02 +0100 clisp (1:2.30-9) unstable; urgency=low * Fix build on arm. * Disable global register variables on all architectures. -- Will Newton Fri, 6 Jun 2003 09:52:05 +0100 clisp (1:2.30-8) unstable; urgency=low * Fix build with gcc-3.3 (Closes: #196246) -- Will Newton Thu, 5 Jun 2003 19:35:16 +0100 clisp (1:2.30-7) unstable; urgency=low * Acknowledge NMU (Closes: #174272,#173728,#162186) * Work around gcc bug with global register variables. (Closes: #183796, #184632) * Updated Standards-Version. -- Will Newton Mon, 12 May 2003 18:52:05 +0100 clisp (1:2.30-6.1) unstable; urgency=low * NMU with permission * Remove obsolete install-defsystem & remove-defsystem options in clisp.sh * Add preinst and postrm files to remove .mem and .run files. Closes:#174272,#173728,#162186. * Exclude lispinit.mem from md5sums since this file is modified after the Common Lisp Controller installation. -- Kevin M. Rosenberg Tue, 4 Mar 2003 10:32:15 -0700 clisp (1:2.30-6) unstable; urgency=low * Added common-lisp-controller fixes from Kevin M. Rosenberg. * Closes: #165722, #170651 * Use new-clx module on capable architectures, mit-clx on others. * Build-Depend xlibs-dev, Suggest xlibs -- Will Newton Tue, 10 Dec 2002 22:01:24 +0000 clisp (1:2.30-5) unstable; urgency=low * More alpha fixes. -- Will Newton Tue, 24 Sep 2002 00:06:58 +0100 clisp (1:2.30-4) unstable; urgency=low * Alpha build fix. * Close bugs from previous changelog entries - Closes: #123035, #126913, #118818, #123076, #149131 - Closes: #46059, #108901, #130077 * Disable FFI on mipsel. * Try and fix m68k. -- Will Newton Mon, 23 Sep 2002 16:56:41 +0100 clisp (1:2.30-3) unstable; urgency=low * Fix ARM build. * common-lisp-controller support. (Closes: Bug#108884) - Thanks to Kevin M. Rosenberg * Fix bashisms in c-l-c code. * First upload as a DD! -- Will Newton Sun, 22 Sep 2002 21:08:40 +0100 clisp (1:2.30-2) unstable; urgency=low * Add readline build depends. * Better fix for hppa crash. * Uploaded sponsored by "Matthew Danish " -- Will Newton Fri, 20 Sep 2002 03:16:01 +0100 clisp (1:2.30-1) unstable; urgency=low * New upstream version - Use system versions of libiconv, gettext and readline. - Split off libsigsegv. - Use UCS-4 characters internally. - Russian translation. * Disable dynamic FFI on ARM * Disable register allocation on sparc. (Closes: Bug#46059, Bug#108901) * Disable dynamic FFI on hppa, fix arihppa.d. * Should finally build on hppa. -- Will Newton Wed, 18 Sep 2002 01:33:41 +0100 clisp (1:2.29-2) unstable; urgency=low * Add regexp module support. -- Will Newton Sun, 11 Aug 2002 22:06:51 +0100 clisp (1:2.29-1) unstable; urgency=low * New upstream release. -- Will Newton Wed, 31 Jul 2002 01:48:37 +0100 clisp (1:2.28-2) unstable; urgency=low * Export syscalls (Closes: Bug#123076) * Support CLX (Closes: Bug#118818) * Fixed in last upload (Closes: Bug#149131, Bug#123035, Bug#126913) * Acknowledge NMU (Closes: Bug#130077) * Add glibc bindings. * Yet more hppa fixes. * First attempt at mipsel support. -- Will Newton Sat, 13 Jul 2002 14:57:06 +0100 clisp (1:2.28-1) unstable; urgency=low * Final set of hppa fixes. * Release into the wild. -- Will Newton Fri, 14 Jun 2002 15:22:41 +0100 clisp (1:2.28-0.6) unstable; urgency=low * Hopefully fix mips build. * More hppa fixes. -- Will Newton Thu, 21 Mar 2002 15:57:10 +0000 clisp (1:2.28-0.5) unstable; urgency=low * Hopefully fix ARM build. -- Will Newton Thu, 21 Mar 2002 13:32:07 +0000 clisp (1:2.28-0.4) unstable; urgency=low * Hopefully fix sparc build. -- Will Newton Thu, 21 Mar 2002 03:15:22 +0000 clisp (1:2.28-0.3) unstable; urgency=low * Update config.{sub,guess}. * Fix alpha build. -- Will Newton Wed, 20 Mar 2002 18:32:52 +0000 clisp (1:2.28-0.2) unstable; urgency=low * New maintainer. * Really fix hppa build. -- Will Newton Mon, 18 Mar 2002 18:12:20 +0000 clisp (1:2.28-0.1) unstable; urgency=low * New upstream release. (closes: Bug#134565) * Build with -fPIC on hppa. (closes: Bug#123035, Bug#126913) -- Will Newton Mon, 18 Mar 2002 18:12:07 +0000 clisp (1:2.27-0.5) unstable; urgency=low * Non-maintainer upload. * bison, gettext build-deps added. -- Francesco P. Lovergine Tue, 5 Feb 2002 16:38:18 +0100 clisp (1:2.27-0.4) unstable; urgency=low * Non-maintainer upload. * Now build on alpha. (closes: #111285) * groff build-dep added. * lintian clean. -- Francesco P. Lovergine Wed, 30 Jan 2002 17:32:03 +0100 clisp (1:2.27-0.3) unstable; urgency=low * Non-maintainer upload * global register assignment in src/lispbibl.d disabled for s390, doesn't work on s390 probably due to a compiler bug. * s390 ffcall patches applied. (Closes: #130077) -- Gerhard Tonn Mon, 21 Jan 2002 07:46:15 +0100 clisp (1:2.27-0.2) unstable; urgency=low * Maintainer set to QA. * clisp has serious portability issues that I cannot resolve, and upstream appears to have gone dormant again (6 months since last release). -- Matt Zimmerman Tue, 15 Jan 2002 17:46:15 -0500 clisp (1:2.27-0.1) unstable; urgency=low * Non-maintainer upload * Previous NMU was becoming hack upon hack upon hack, so I gave up and started over. Last maintainer upload was over 1 year ago. * New upstream version (Closes: #96599) - Already includes the suggested patch for ARM (Closes: #87395) * Repackaged from scratch - Doesn't try to remove files outside the build tree (Closes: #74610) - Compresses documentation, and separates into clisp-doc (Closes: #96602) - COPYRIGHT folded into copyright (Closes: #96600) - Build dependencies are included (Closes: #70353) - /usr/lib/clisp/{base,full} are in fact exactly alike. Replace the contents of base with symlinks (Closes: #69992) - Remove duplicate copies of man pages (Closes: #65609) * Use latest config.{guess,sub} (2.27 already handles them correctly) (Closes: #104879) -- Matt Zimmerman Sat, 11 Aug 2001 20:23:05 -0400 clisp (2000-03-06-2.1) unstable; urgency=low * Non-maintainer upload * Update config.{guess,sub} (Closes: #104879) * Fix */autoconf/aclocal.m4's CL_CANONICAL_HOST macro to work with GNU system types where the 'os' portion takes the form 'kernel-system' * debian/rules: Remove config.cache files from source, and other miscellaneous clean fixes * debian/rules: Make /usr/lib/clisp/base a symlink to full (Closes: #69992) * Apply patch from Peter Naulls to hopefully fix compilation on ARM. (Closes: #87395) * Don't try to remove files in /usr/share in debian/rules (Closes: #74610) * Compress documentation, and don't install impnotes.html twice (Closes: #96602) * Verified that /usr/share/doc/clisp/copyright is present; COPYRIGHT is the original file from the upstream sources (Closes: #96600) * Verified that build dependencies are present and sane (Closes: #70353) * Removed over 300k of SETI@Home data files added by diff.gz. This, and the improved clean target result in a much more manageable diff.gz. * This package needs source code reorganization. There are a lot of files duplicated within the package, and copied from other packages. * There is a far newer upstream version (2.27, 2001/07/16) which probably fixes many problems. -- Matt Zimmerman Sat, 11 Aug 2001 19:26:19 -0400 clisp (2000-03-06-2) unstable; urgency=low * fixed problem with package creating user name appearing in clisp binary. (closes: #62923). -- Kevin Dalley Fri, 12 May 2000 01:46:29 -0700 clisp (2000-03-06-1) unstable; urgency=low * new upstream release. -- Kevin Dalley Sat, 18 Mar 2000 12:05:46 -0800 clisp (1999-07-22-4) frozen unstable; urgency=low * correct ownership of files. All files should be owned by root, rather than by user who packages clisp (closes: #516687). -- Kevin Dalley Sun, 16 Jan 2000 14:56:59 -0800 clisp (1999-07-22-3) unstable; urgency=low * corrected installation of clisp (closes: #48607). -- Kevin Dalley Thu, 28 Oct 1999 17:41:41 -0700 clisp (1999-07-22-2) unstable; urgency=low * corrected links from /usr/doc to /usr/share/doc -- Kevin Dalley Wed, 27 Oct 1999 15:14:01 -0700 clisp (1999-07-22-1) unstable; urgency=low * new release of clisp (closes: #46043) (probably closes: #46059, requires sparc compilation to check) -- Kevin Dalley Wed, 27 Oct 1999 11:20:37 -0700 clisp (1999-01-08-2) unstable; urgency=low * additional patch for m68k (closes: #36525) -- Kevin Dalley Tue, 27 Apr 1999 01:19:43 -0700 clisp (1999-01-08-1) unstable; urgency=low * Changed bytecode format. All .fas files generated by previous CLISP versions are invalid and must be recompiled. * installed {bytecode,impnotes}.html in clisp/doc/html (closes bug #33038). * recompiled for glibc2.1 (closes: #35653) * added fixed m68k syntax (probably closes: #28975) -- Kevin Dalley Wed, 7 Apr 1999 00:06:02 -0700 clisp (1998-09-09-2) unstable; urgency=low * fixed location where lisp.run is expected to be. (closes bug #31591) -- Kevin Dalley Thu, 7 Jan 1999 21:44:53 -0800 clisp (1998-09-09-1) unstable; urgency=low * first release of 1998-09-09 (believed to fix bugs #20844 and #23328) * COPYRIGHT file removed (fixes bug #21952) -- Kevin Dalley Sun, 27 Dec 1998 04:11:35 -0800 clisp (1997-12-06-1) unstable; urgency=low * new version of clisp -- Kevin Dalley Sun, 22 Feb 1998 19:31:55 -0800 clisp (1997-09-25-1) unstable; urgency=low * first release of clisp. -- Kevin Dalley Thu, 22 May 1997 23:51:34 -0700 debian/README.source0000664000000000000000000000222112317455203011346 0ustar To build this package you need to get the git repository: git clone http://git.debian.org/git/pkg-common-lisp/clisp.git Upstream gets imported directly from the tar.gz file into the upstream branch. for more informatin regarding the packaging standards see: http://wiki.debian.org/Teams/DebianCommonLisp/GitPackaging Don't forget to change the hard-coded version number: vim debian/clisp-dev.install debian/clisp.install debian/clisp.sh debian/postrm debian/preinst debian/rules To build: git-buildpackage -uc -us --git-debian-branch=master- --git-upstream-branch=upstream- please check your package with: lintian --verbose --info --display-info --md5sums *.changes Then commit any changes and either send me the diff or push this to somewhere were I can fetch it. Some notes on this package: - we cannot link to libreadline v6, see bug #553741 - clisp uses --host and --target only if you do cross compilation, which is a manual affair, so we cannot use this. This means we cannot fix bug #491573 for example... - we disabled dynamic modules on sparc as it will build and will survice 'make check', but dies when loading a module. debian/clisp-module-wildcard.install0000664000000000000000000000015612317455203014750 0ustar usr/lib/clisp-2.49/dynmod/lib-wildcard.so usr/lib/clisp-2.49/dynmod/wildcard.lisp usr/lib/clisp-2.49/wildcard debian/install-clc.lisp0000664000000000000000000000102112317455203012262 0ustar ;;;; -*- Mode: Lisp; Package: CL-USER -*- ;;;; Copyright (c) 2004 Kevin M. Rosenberg ;;;; GNU GPL v2 license (in-package #:cl-user) (handler-case (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp") (error (e) (format t "Error during loading of common-lisp-controller.lisp: ~A~%" e) (error e))) (handler-case (common-lisp-controller:init-common-lisp-controller-v4 "clisp") (error (e) (format t "Error during init-common-lisp-controller-v4: ~A~%" e) (error e))) debian/control0000664000000000000000000001776212317455605010620 0ustar Source: clisp Section: lisp Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Common Lisp Team Uploaders: Peter Van Eynde , Christoph Egger Build-Depends: debhelper (>> 7), gettext, bison, libncurses5-dev, groff, libx11-dev, libxext-dev, libxpm-dev, libsigsegv-dev (>= 2.8), libreadline-gplv2-dev, dh-lisp (>= 0.7.1), libdb-dev, libffcall1-dev , libgdbm-dev , libpq-dev [ !hppa !ia64 !m68k !s390 !mipsel !powerpc !powerpcspe], libpcre3-dev, libdbus-1-dev [ !hppa !ia64 !m68k !s390 !mipsel !powerpc !powerpcspe], zlib1g-dev [ !hppa !ia64 !m68k !s390 !mipsel !powerpc !powerpcspe] Build-Conflicts: libsigsegv-dev (<= 2.8), libreadline6-dev Standards-Version: 3.9.1.0 Homepage: http://www.clisp.org/ Vcs-Git: http://git.debian.org/git/pkg-common-lisp/clisp.git Vcs-Browser: http://git.debian.org/?p=pkg-common-lisp/clisp.git;a=summary Package: clisp Architecture: alpha amd64 armel armhf armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe kfreebsd-i386 kfreebsd-amd64 armel armhf m68k hurd-i386 s390 s390x s390x sparc Pre-Depends: ${xlibs:PreDepends} Conflicts: clisp-dev (<< 1:2.49-2) Depends: ${shlibs:Depends}, ${misc:Depends} Breaks: common-lisp-controller (<< 6.19), cl-asdf (<< 2:1.704-1) Provides: lisp-compiler, ${clisp:fasl-version} Suggests: gdb, clisp-doc, clisp-dev, slime Description: GNU CLISP, a Common Lisp implementation ANSI Common Lisp is a high-level, general-purpose programming language. GNU CLISP 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 MB 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. Package: clisp-dev Architecture: alpha amd64 armel armhf armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe kfreebsd-i386 kfreebsd-amd64 armel armhf m68k hurd-i386 s390 s390x s390x sparc Depends: clisp, ${misc:Depends} Description: GNU CLISP, a Common Lisp implementation (development files) This is the link kit of clisp, it can be used to add external modules (written for example in C) to the implementation. The module can define new variables, symbols and functions for use in clisp. Examples include database interfaces or widget libraries. Normal users do not need this. . See also http://clisp.cons.org/impnotes.html#modules . ANSI Common Lisp is a high-level, general-purpose programming language. GNU CLISP 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 MB of RAM. Package: clisp-doc Section: doc Architecture: all Depends: ${misc:Depends} Description: GNU CLISP, a Common Lisp implementation (documentation) This is the documentation for clisp. . ANSI Common Lisp is a high-level, general-purpose programming language. GNU CLISP 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 MB of RAM. Package: clisp-module-berkeley-db Architecture: alpha amd64 armel armhf armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe kfreebsd-i386 kfreebsd-amd64 armel armhf m68k hurd-i386 s390 s390x s390x Depends: ${shlibs:Depends}, clisp, ${misc:Depends} Description: clisp module that adds an interface to Berkeley DB This adds a module to clisp that implements an interface to the Berkeley DB. Package: clisp-module-pcre Architecture: alpha amd64 armel armhf armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe kfreebsd-i386 kfreebsd-amd64 armel armhf m68k hurd-i386 s390 s390x s390x Depends: ${shlibs:Depends}, clisp, ${misc:Depends} Description: clisp module that adds libpcre support This adds a module to clisp that implements an interface to the libpcre which implements Perl-compatible regular expressions. Package: clisp-module-bindings-glibc Architecture: alpha amd64 armel armhf armel armhf i386 mips kfreebsd-i386 kfreebsd-amd64 armel armhf hurd-i386 Depends: ${shlibs:Depends}, clisp, ${misc:Depends} Description: clisp module that adds the glibc bindings This adds a module to clisp that implements an interface to the glibc library, adding support for a number of low level functions. Package: clisp-module-postgresql Architecture: alpha amd64 armel armhf i386 mips kfreebsd-i386 kfreebsd-amd64 armel armhf hurd-i386 Depends: ${shlibs:Depends}, clisp, ${misc:Depends} Description: clisp module that adds a PostgreSQL interface This adds a module to clisp that implements an interface to the PostgreSQL DB using the C bindings. Package: clisp-module-clx Architecture: alpha amd64 armel armhf armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe kfreebsd-i386 kfreebsd-amd64 armel armhf m68k hurd-i386 s390 s390x Depends: ${shlibs:Depends}, clisp, ${misc:Depends} Description: clisp module that adds X11 bindings This adds a module to clisp that implements an interface to the X11 called CLX. Package: clisp-module-rawsock Architecture: alpha amd64 armel armhf armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe kfreebsd-i386 kfreebsd-amd64 armel armhf m68k hurd-i386 s390 s390x Depends: ${shlibs:Depends}, clisp, ${misc:Depends} Description: clisp module that adds a low level socket interface This adds a module to clisp that implements an interface to the socket interfaces. Package: clisp-module-dbus Architecture: alpha amd64 armel armhf i386 mips kfreebsd-i386 kfreebsd-amd64 armel armhf hurd-i386 Depends: ${shlibs:Depends}, clisp, ${misc:Depends} Description: clisp module that adds an interface to D-Bus This adds a module to clisp that implements an interface to the D-Bus system. Package: clisp-module-wildcard Architecture: alpha amd64 armel armhf i386 mips kfreebsd-i386 kfreebsd-amd64 armel armhf hurd-i386 Depends: ${shlibs:Depends}, clisp, ${misc:Depends} Description: clisp module that adds wildcard matching This adds a module to clisp that implements a wildcard matching, also called shell globbing. Package: clisp-module-gdbm Architecture: alpha amd64 armel armhf armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe kfreebsd-i386 kfreebsd-amd64 armel armhf m68k hurd-i386 s390 s390x Depends: ${shlibs:Depends}, clisp, ${misc:Depends} Description: clisp module that adds an interface to GNU DBM This adds a module to clisp that implements an interface to GNU DBM. Package: clisp-module-zlib Architecture: alpha amd64 armel armhf i386 mips kfreebsd-i386 kfreebsd-amd64 armel armhf hurd-i386 Depends: ${shlibs:Depends}, clisp, ${misc:Depends} Description: clisp module that adds zlib support for vectors This adds a module to clisp that implements a zlib interface, allowing you to compress vectors using zlib. debian/fasl-version.lisp0000664000000000000000000000110012317455203012463 0ustar ;;;; Find out the FASL version of this Clisp release and dump it to the ;;;; debian/clisp.substvars variable, so it can be used in ;;;; debian/control ;;;; ;;;; Packages that want to provide binary Clisp FASLs can then depend ;;;; on clisp-fasl-loader-XX ;;;; ;;;; -- René van Bevern , Sat Sep 3 19:23:20 2005 (with-open-file (substvars "debian/clisp.substvars" :direction :output :if-exists :append :if-does-not-exist :create) (format substvars "~&clisp:fasl-version=clisp-fasl-loader-~A~%" (car (system::version)))) (ext:quit) debian/clisp.install0000664000000000000000000000047212317455203011677 0ustar usr/bin/clisp usr/lib/clisp-2.49/install-clc.lisp usr/lib/clisp-2.49/data usr/lib/clisp-2.49/base/lispinit.mem usr/lib/clisp-2.49/base/lisp.run usr/lib/clisp-2.49/base/*.o usr/lib/common-lisp usr/share/man/man1/clisp.1 usr/share/locale usr/lib/clisp-2.49/linkkit usr/bin/clisp-link usr/share/man/man1/clisp-link.1 debian/rules0000775000000000000000000001377612317455307010275 0ustar #!/usr/bin/make -f # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 # check if we need to use DEBUG: DEBUG_FLAGS:=$(if $(findstring debug,$(DEB_BUILD_OPTIONS)),--with-debug,) #standard C flags: CFLAGS:=-falign-functions=4 export CFLAGS # change the CFLAGS depending on the architecture DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) ifneq (,$(filter m68k alpha hppa powerpc,$(DEB_BUILD_ARCH))) CFLAGS:=-D SAFETY=3 -D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP ${CFLAGS} endif ifneq (,$(filter ia64 ,$(DEB_BUILD_ARCH))) CFLAGS:=-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP ${CFLAGS} endif ifneq (,$(filter sparc ,$(DEB_BUILD_ARCH))) CFLAGS:=-mcpu=v9 -fno-gcse -DSAFETY=3 -D SAFETY=3 -D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP ${CFLAGS} endif ifneq (,$(filter armhf ,$(DEB_BUILD_ARCH))) CFLAGS:=-marm ${CFLAGS} endif ifneq (,$(filter hppa ia64 m68k s390 mipsel powerpc powerpcspe,$(DEB_BUILD_ARCH))) # Disable FFI FFI:=--without-dynamic-ffi MODULES:=--with-module=gdbm --with-module=berkeley-db --with-module=pcre --with-module=rawsock --with-module=clx/new-clx else ifneq (,$(filter sparc ,$(DEB_BUILD_ARCH))) # Disable FFI and the dynamic modules # this will only build a base and full package: FFI:=--without-dynamic-ffi --without-dynamic-modules MODULES:=--with-module=gdbm --with-module=berkeley-db --with-module=pcre --with-module=rawsock --with-module=clx/new-clx else # Enable FFI on all other platforms FFI:=--with-dynamic-ffi --with-dynamic-modules MODULES:=--with-module=bindings/glibc --with-module=gdbm --with-module=berkeley-db --with-module=postgresql --with-module=pcre --with-module=wildcard --with-module=zlib --with-module=rawsock --with-module=dbus --with-module=clx/new-clx endif configure: configure-stamp configure-stamp: echo we have no configure step touch configure-stamp build: build-stamp build-stamp: dh_testdir # on systems without FFI we cannot make multiple packages ./configure debian/build ${DEBUG_FLAGS} --prefix=/usr --fsstnd=debian ${FFI} CFLAGS="${CFLAGS}" ${MODULES} || { cat debian/build/config.log; touch foo.h; cpp -dM foo.h ; exit 1; } # remove the -O2 from the makefile ifneq (,$(filter sparc mipsel ia64 ,$(DEB_BUILD_ARCH))) sed 's/ -O2 / /' < debian/build/Makefile > debian/build/Makefile-new && \ mv debian/build/Makefile debian/build/Makefile-old && \ mv debian/build/Makefile-new debian/build/Makefile endif # filter mipsel ia64 ,$(DEB_BUILD_ARCH) remove the -O2 from the makefile # build the package $(MAKE) -C debian/build touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp rm -rf debian/build chmod a+x configure dh_clean install: build # echo doing install dh_testdir dh_testroot dh_prep dh_installdirs -A # install the package $(MAKE) -C debian/build DESTDIR=$(shell pwd)/debian/tmp install mkdir -p debian/tmp/usr/share/doc debian/tmp/usr/share/man debian/tmp/usr/lib/common-lisp debian/tmp/usr/sbin debian/tmp/usr/bin # remove unwanted upstream doc/ files rm debian/tmp/usr/share/doc/clisp/doc/clisp.1 \ debian/tmp/usr/share/doc/clisp/doc/clisp-link.1 \ debian/tmp/usr/share/doc/clisp/COPYRIGHT \ debian/tmp/usr/share/doc/clisp/GNU-GPL || true # Install CLC files install -o root -g root -m 0644 debian/install-clc.lisp \ debian/tmp/usr/lib/clisp-2.49 dh_install --sourcedir=debian/tmp # remove docs from the clx package: if [ -d debian/clisp-module-clx/usr/lib/clisp-2.49/clx/new-clx/demos ] ; then rm -rf debian/clisp-module-clx/usr/lib/clisp-2.49/clx/new-clx/demos ; fi # handle full image if it exists, normally we do not build it if [ -d debian/tmp/usr/lib/clisp-2.49/full ] ; then mkdir -p debian/clisp-dev/usr/lib/clisp-2.49/full/ ; fi if [ -d debian/tmp/usr/lib/clisp-2.49/full ] ; then mkdir -p debian/clisp/usr/lib/clisp-2.49/full/ ; fi if [ -d debian/tmp/usr/lib/clisp-2.49/full ] ; then install --owner=root --group=root --mode=0644 debian/tmp/usr/lib/clisp-2.49/full/*.a debian/clisp-dev/usr/lib/clisp-2.49/full/ ; fi if [ -d debian/tmp/usr/lib/clisp-2.49/full ] ; then install --owner=root --group=root --mode=0644 debian/tmp/usr/lib/clisp-2.49/full/*.h debian/clisp-dev/usr/lib/clisp-2.49/full/ ; fi if [ -d debian/tmp/usr/lib/clisp-2.49/full ] ; then install --owner=root --group=root --mode=0644 debian/tmp/usr/lib/clisp-2.49/full/makevars debian/clisp-dev/usr/lib/clisp-2.49/full/ ; fi if [ -d debian/tmp/usr/lib/clisp-2.49/full ] ; then install --owner=root --group=root --mode=0644 debian/tmp/usr/lib/clisp-2.49/full/lispinit.mem debian/clisp/usr/lib/clisp-2.49/full/ ; fi if [ -d debian/tmp/usr/lib/clisp-2.49/full ] ; then install --owner=root --group=root --mode=0755 debian/tmp/usr/lib/clisp-2.49/full/lisp.run debian/clisp/usr/lib/clisp-2.49/full/ ; fi if [ -d debian/tmp/usr/lib/clisp-2.49/full ] ; then install --owner=root --group=root --mode=0644 debian/tmp/usr/lib/clisp-2.49/full/*.o debian/clisp/usr/lib/clisp-2.49/full/ ; fi # Build architecture-independent files here. binary-indep: build install dh_testdir -i dh_testroot -i dh_installdocs -i dh_installexamples -i dh_installchangelogs -a -i src/ChangeLog -i dh_strip -i dh_link -i dh_compress -i dh_fixperms -i dh_installdeb -i dh_shlibdeps -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i # Build architecture-dependent files here. binary-arch: build install dh_testdir -a dh_testroot -a dh_installdocs -a dh_installexamples -a dh_installman -a dh_installchangelogs -a -i src/ChangeLog -a dh_lisp clisp -a dh_strip -a dh_link -a dh_compress -a dh_fixperms -a dh_installdeb -a dh_shlibdeps -a # add FAS file format version to substvars debian/clisp/usr/bin/clisp -Efile utf-8 -B debian/clisp/usr/lib/clisp-2.49 -M debian/clisp/usr/lib/clisp-2.49/base/lispinit.mem debian/fasl-version.lisp dh_gencontrol -a dh_md5sums -a dh_builddeb -a binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure debian/clisp-module-rawsock.install0000664000000000000000000000015312317455203014625 0ustar usr/lib/clisp-2.49/dynmod/lib-rawsock.so usr/lib/clisp-2.49/dynmod/rawsock.lisp usr/lib/clisp-2.49/rawsock debian/watch0000664000000000000000000000011712317455203010222 0ustar version=2 http://ftp.gnu.org/pub/gnu/clisp/latest/clisp-([0-9.]*)\.tar\.gz debian/clisp-module-bindings-glibc.install0000664000000000000000000000015012317455203016024 0ustar usr/lib/clisp-2.49/bindings usr/lib/clisp-2.49/dynmod/linux.lisp usr/lib/clisp-2.49/dynmod/lib-linux.so debian/clisp-module-clx.docs0000664000000000000000000000006012317455203013221 0ustar debian/tmp/usr/lib/clisp-2.49/clx/new-clx/demos debian/clisp-module-pcre.install0000664000000000000000000000014212317455203014103 0ustar usr/lib/clisp-2.49/dynmod/lib-pcre.so usr/lib/clisp-2.49/dynmod/pcre.lisp usr/lib/clisp-2.49/pcre debian/clisp-dev.install0000664000000000000000000000013112317455203012443 0ustar usr/lib/clisp-2.49/base/*.a usr/lib/clisp-2.49/base/*.h usr/lib/clisp-2.49/base/makevars debian/README.Debian0000664000000000000000000000062012317455203011231 0ustar clisp for Debian ================ CLX --- clisp is compiled with support for CLX, an interface to the X Window System from Common Lisp code. Syscalls -------- clisp is compiled with support exported syscalls. This allows various system calls to be made from clisp (e.g. resolve-host-ipaddr). disassemble ----------- In order to use the "disassemble" function you must install gdb. debian/compat0000664000000000000000000000000212317455203010370 0ustar 7 debian/patches/0000775000000000000000000000000012317455607010631 5ustar debian/patches/clisp-link.patch0000664000000000000000000001404712317455203013715 0ustar Description: adapt clisp-link to support DESTDIR Author: Sam Steingold Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=177057 Bug-Debian: http://bugs.debian.org/177057 Forwarded: not-needed --- clisp.orig/src/clisp-link.in +++ clisp/src/clisp-link.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Usage: clisp-link command [more args] # where # command = create, add, run, install @@ -143,22 +143,24 @@ # Where do we install? DYNMOD="dynmod" # should be in sync with defs1.lisp:require LIBDIR="" +try_set_LIBDIR() { + mkdir -p "$1" || fail "Directory $2=$1 does not exist" + mkdir -p "$1/${DYNMOD}" || fail "Directory $2=$1 is not writable" + f="$1/${DYNMOD}/.abazonk" + if touch "$f" 2>/dev/null; then + rm -f "$f" + LIBDIR=$1 + fi +} set_dynamic_module_location() { - if test -z "${LIBDIR}"; then - if touch ${CLISP_LIBDIR}/${DYNMOD}/.abazonk 2>/dev/null; then - rm -f ${CLISP_LIBDIR}/${DYNMOD}/.abazonk - LIBDIR=${CLISP_LIBDIR} - else # cf. src/m4/clisp.m4 + if test "$with_dynamic_modules" != no -a -z "${LIBDIR}"; then + try_set_LIBDIR "${CLISP_LIBDIR}" "*lib-directory*" + if test -z "${LIBDIR}"; then # cf. src/m4/clisp.m4 CLISP_LIBDIR_USER=`clisp_eval '(and *user-lib-directory* (namestring *user-lib-directory*))'` test "${CLISP_LIBDIR_USER}" = "NIL" && \ fail "Cannot determine the dynamic module directory: *lib-directory* is not writable and *user-lib-directory* is not specified" - mkdir -p ${CLISP_LIBDIR_USER}/${DYNMOD} || \ - fail "Cannot write in *user-lib-directory*" - if touch ${CLISP_LIBDIR_USER}/${DYNMOD}/.abazonk 2>/dev/null; then - rm -f ${CLISP_LIBDIR_USER}/${DYNMOD}/.abazonk - LIBDIR=${CLISP_LIBDIR_USER} - else fail "Cannot determine the dynamic module directory: neither *lib-directory* nor *user-lib-directory* are writable" - fi + try_set_LIBDIR "${CLISP_LIBDIR_USER}" "*user-lib-directory*" + test -z "${LIBDIR}" && fail "Cannot determine the dynamic module directory: neither *lib-directory* nor *user-lib-directory* are writable" fi fi } @@ -177,9 +179,9 @@ # this can be invoked only after "./link.sh" and relies on its variables. # also uses: # ${absolute_currentdir} : the top level directory +# appends the newly created DYNDIR files to DYNDIR_FILES prepare_dynamic_module() { if test "$with_dynamic_modules" != no; then - set_dynamic_module_location dyndir=${LIBDIR}/${DYNMOD} dll="lib"; for m in ${NEW_MODULES}; do dll=${dll}-$m; done; dll=${dll}@SHREXT@ lib=${dyndir}/${dll}; libs="${NEW_LIBS} @CLISP_DEF@"; verbose @createsharedlib@ @@ -194,33 +196,33 @@ done # create the REQUIRE file reqfile=${dyndir}/${firstmod}.lisp - rm -f ${reqfile} + DYNDIR_FILES=${DYNDIR_FILES}" ${lib} ${reqfile}" + rm -f "${reqfile}" for f in ${TO_PRELOAD}; do # preload files are not compiled - echo "(cl:load (cl:merge-pathnames \"../${moduledir}/${f}\" cl:*load-truename*))" >> ${reqfile} + echo "(cl:load (cl:merge-pathnames \"../${moduledir}/${f}\" cl:*load-truename*))" >> "${reqfile}" done # dll has SHREXT extension DM="(sys::dynload-modules (cl:merge-pathnames \"${dll}\" cl:*load-truename*) (quote (" for m in ${NEW_MODULES}; do DM=${DM}" \"$m\"" done - echo ${DM}" )))" >> ${reqfile} + echo ${DM}" )))" >> "${reqfile}" if test -n "${TO_LOAD}"; then - echo ";; for def-call-out to non-existent functions" >> ${reqfile} - echo "(ext:appease-cerrors" >> ${reqfile} + echo "(ext:appease-cerrors ; for DEF-CALL-OUT to non-existent functions" >> "${reqfile}" for f in ${TO_LOAD}; do # module files must be compiled - echo " (cl:load (cl:merge-pathnames \"../${moduledir}/${f}.fas\" cl:*load-truename*))" >> ${reqfile} + echo " (cl:load (cl:merge-pathnames \"../${moduledir}/${f}.fas\" cl:*load-truename*))" >> "${reqfile}" done - echo ")" >> ${reqfile} + echo ")" >> "${reqfile}" fi # create links to the REQUIRE file for m in ${othermods}; do - ln ${dyndir}/$m.lisp ${reqfile} + ln ${dyndir}/$m.lisp "${reqfile}" + DYNDIR_FILES=${DYNDIR_FILES}' '${dyndir}/$m.lisp done fi } - # Remove the comment to Set debugging output on #set -x @@ -386,6 +388,7 @@ # Prepare the module directories and read their variables PRELOAD='' LOAD='' + set_dynamic_module_location # set LIBDIR for moduledir in $moduledirs; do modulename=`basename "$moduledir"` # Prepare the module directory and read the variables NEW_FILES, NEW_LIBS @@ -542,6 +545,10 @@ done # Read the variables CC, CPPFLAGS, CFLAGS, CLFLAGS, LIBS, X_LIBS, RANLIB, FILES . "$sourcedir"/makevars + set_dynamic_module_location # set LIBDIR + test -n "${DESTDIR}" || DESTDIR="${LIBDIR}" + mkdir -p "${DESTDIR}" + absdestdir=`cd "${DESTDIR}"; /bin/pwd` # Prepare the module directories and read their variables for moduledir in $moduledirs; do modulename=`basename "$moduledir"` @@ -555,17 +562,21 @@ cd "$moduledir" absolute_moduledir=`/bin/pwd` . ./link.sh - prepare_dynamic_module # sets LIBDIR - mkdir -p "${LIBDIR}/$moduledir" + DYNDIR_FILES='' + prepare_dynamic_module # append to DYNDIR_FILES + mkdir -p "${absdestdir}/$moduledir" # when running "CLISP=./clisp ./clisp-link install " # in the build directory, avoid "cp: `...' and `...' are the same file" - absolute_distribdir=`cd "${LIBDIR}/$moduledir"; /bin/pwd` - test "${absolute_moduledir}" = "${absolute_distribdir}" || \ - make clisp-module-distrib LN=cp distribdir="${LIBDIR}/$moduledir" + if [ "${absolute_moduledir}" != "${absdestdir}/$moduledir" ]; then + 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}/ + done + fi cd "$absolute_currentdir" done ;; - *) usage;; esac debian/patches/kfreebsd-amd64.diff0000664000000000000000000000411012317455203014145 0ustar === modified file 'src/lispbibl.d' Index: clisp/src/lispbibl.d =================================================================== --- clisp.orig/src/lispbibl.d 2011-07-13 00:28:05.000000000 +0200 +++ clisp/src/lispbibl.d 2011-07-13 00:28:10.000000000 +0200 @@ -2979,7 +2979,7 @@ #endif -#if (oint_addr_shift == 0) && (addr_shift == 0) && defined(TYPECODES) && !defined(WIDE_SOFT) && !(defined(AMD64) && defined(UNIX_LINUX)) +#if (oint_addr_shift == 0) && (addr_shift == 0) && defined(TYPECODES) && !defined(WIDE_SOFT) && !(defined(AMD64) && defined(UNIX_GNU)) /* If the address bits are the lower ones and not WIDE_SOFT, memory mapping may be possible. */ Index: clisp/src/spvw.d =================================================================== --- clisp.orig/src/spvw.d 2011-07-13 00:28:05.000000000 +0200 +++ clisp/src/spvw.d 2011-07-13 00:28:10.000000000 +0200 @@ -3019,7 +3019,7 @@ var aint end = bitm(oint_addr_len-1); /* keep garcol_bit zero */ #endif var aint part = floor(end - (start & (end-1)),5); - #if defined(AMD64) && defined(UNIX_LINUX) + #if defined(AMD64) /* Don't use more than 36 address bits, otherwise mmap() fails. */ part &= 0x0000000FFFFFFFFFUL; #endif @@ -3068,7 +3068,7 @@ #endif #endif var aint part = floor(end - (start & (end-1)),5); - #if defined(AMD64) && defined(UNIX_LINUX) + #if defined(AMD64) /* Don't use more than 36 address bits, otherwise mmap() fails. */ part &= 0x0000000FFFFFFFFFUL; #endif Index: clisp/src/spvw_page.d =================================================================== --- clisp.orig/src/spvw_page.d 2011-07-13 00:28:05.000000000 +0200 +++ clisp/src/spvw_page.d 2011-07-13 00:28:10.000000000 +0200 @@ -113,7 +113,7 @@ only a 2^32 size address space. */ #define oint_addr_relevant_len 32 #endif - #if (defined(IA64) || defined(AMD64)) && defined(UNIX_LINUX) + #if defined(IA64) || defined(AMD64) /* It is unlikely that more than 4 GB will be used. */ #define oint_addr_relevant_len 32 #endif debian/patches/arm-sf.patch0000664000000000000000000012174412317455203013040 0ustar Description: Added SF patch See: http://sourceforge.net/tracker/index.php?func=detail&aid=3529615&group_id=1355&atid=301355 Author: Tom Vijlbrief --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: , Bug: Bug-Debian: http://bugs.debian.org/ Bug-Ubuntu: https://launchpad.net/bugs/ Forwarded: Reviewed-By: Last-Update: --- clisp-2.49.orig/src/ariarm.d +++ clisp-2.49/src/ariarm.d @@ -86,7 +86,7 @@ pc .req r15 #define C(x) x #define EXPORT(x) .global x -#define GLABEL(x) x: +#define GLABEL(x) .type x STT_FUNC; x: #define LABEL(x) x: #define RRX rrx #define END @@ -187,7 +187,7 @@ GLABEL(mulu32_) LDR a3,[pc,#ptr_mulu32_high-.-8] STR a2,[a3,#0] #endif - MOVS pc,lr + BX lr /* extern uint16 divu_3216_1616_ (uint32 x, uint16 y); entry @@ -243,7 +243,7 @@ GLABEL(divu_3216_1616_) LDR a3,[pc,#ptr_divu_16_rest-.-8] /* save rest so can be picked up later */ STR a2,[a3,#0] /* the result is 16 bits */ #endif - MOVS pc, lr + BX lr /* extern uint32 divu_6432_3232_ (uint32 xhi, uint32 xlo, uint32 y); | -> Quotient q extern uint32 divu_32_rest; | -> Rest r @@ -278,7 +278,7 @@ GLABEL(divu_6432_3232_) LDR a4,[pc,#ptr_divu_32_rest-.-8] STR a2,[a4,#0] /* divu_32_rest = remainder */ #endif - LDMFD sp!, {v1,v2,v3,v4,v5,v6,pc}^ + LDMFD sp!, {v1,v2,v3,v4,v5,v6,pc} LABEL(divu_6432_3232_l1) MOV v3, #0 /* s = 0 */ @@ -346,7 +346,7 @@ LABEL(divu_6432_3232_l1) LDR a3,[pc,#ptr_divu_32_rest-.-8] STR a2,[a3,#0] /* divu_32_rest = remainder */ #endif - LDMFD sp!, {v1,v2,v3,v4,v5,v6,pc}^ + LDMFD sp!, {v1,v2,v3,v4,v5,v6,pc} /* extern uintD* copy_loop_up (uintD* sourceptr, uintD* destptr, uintC count); entry @@ -370,7 +370,7 @@ GLABEL(copy_loop_up) LABEL(copy_loop_up_l1) BICS a4,a3,#3 /* set counter to multiple of 4 */ MOVEQ a1,a2 /* return addr of last word stored */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1,lr} /* save work regs */ LABEL(copy_loop_up_l2) LDMIA a1!,{a3,v1,ip,lr} /* copy 4 words in one go */ @@ -380,7 +380,7 @@ LABEL(copy_loop_up_l2) STMGEIA a2!,{a3,v1,ip,lr} /* 4 more words */ BGT copy_loop_up_l2 /* and loop */ MOV a1,a2 /* return addr of last word stored */ - LDMFD sp!,{v1,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1,pc} /* restore work regs and return */ /* extern uintD* copy_loop_down (uintD* sourceptr, uintD* destptr, uintC count); entry @@ -404,7 +404,7 @@ GLABEL(copy_loop_down) LABEL(copy_loop_down_l1) BICS a4,a3,#3 /* set counter to multiple of 4 */ MOVEQ a1,a2 /* return addr of last word stored */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1,lr} /* save work regs */ LABEL(copy_loop_down_l2) LDMDB a1!,{a3,v1,ip,lr} /* copy 4 words in one go */ @@ -414,7 +414,7 @@ LABEL(copy_loop_down_l2) STMGEDB a2!,{a3,v1,ip,lr} /* 4 more words */ BGT copy_loop_down_l2 /* and loop */ MOV a1,a2 /* return addr of last word stored */ - LDMFD sp!,{v1,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1,pc} /* restore work regs and return */ /* extern uintD* clear_loop_up (uintD* destptr, uintC count); entry @@ -446,7 +446,7 @@ GLABEL(fill_loop_up) STRGT a3,[a1],#4 LABEL(fill_loop_up_l1) BICS a4,a2,#3 /* set counter to multiple of 4 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1,lr} /* save work regs */ MOV v1,a3 /* copy filler to three other */ MOV ip,a3 /* registers */ @@ -456,7 +456,7 @@ LABEL(fill_loop_up_l2) SUBS a4,a4,#8 /* decrement counter by 8 */ STMGEIA a1!,{a3,v1,ip,lr} /* if count still positive then store 4 */ BGT fill_loop_up_l2 /* more and loop */ - LDMFD sp!,{v1,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1,pc} /* restore work regs and return */ /* extern uintD* clear_loop_down (uintD* destptr, uintC count); @@ -489,7 +489,7 @@ GLABEL(fill_loop_down) STRGT a3,[a1,#-4]! LABEL(fill_loop_down_l1) BICS a4,a2,#3 /* set counter to multiple of 4 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1,lr} /* save work regs */ MOV v1,a3 /* copy filler to three other */ MOV ip,a3 /* registers */ @@ -499,7 +499,7 @@ LABEL(fill_loop_down_l2) SUBS a4,a4,#8 /* decrement counter by 8 */ STMGEDB a1!,{a3,v1,ip,lr} /* if count still positive then store 4 */ BGT fill_loop_down_l2 /* more and loop */ - LDMFD sp!,{v1,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1,pc} /* restore work regs and return */ /* extern void or_loop_up (uintD* xptr, uintD* yptr, uintC count); entry @@ -529,7 +529,7 @@ GLABEL(or_loop_up) STRGT ip,[a1],#4 LABEL(or_loop_up_l1) BICS a4,a3,#3 /* set counter to multiple of 4 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1-v5,lr} /* save work regs */ LABEL(or_loop_up_l2) LDMIA a2!,{a3,v1,v2,ip} /* load 4 words in one go */ @@ -541,7 +541,7 @@ LABEL(or_loop_up_l2) STMIA a1!,{v3,v4,v5,lr} /* store 4 results */ SUBS a4,a4,#4 /* decrement counter by 4 */ BGT or_loop_up_l2 /* if count still positive then loop */ - LDMFD sp!,{v1-v5,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v5,pc} /* restore work regs and return */ /* extern void xor_loop_up (uintD* xptr, uintD* yptr, uintC count); entry @@ -571,7 +571,7 @@ GLABEL(xor_loop_up) STRGT ip,[a1],#4 LABEL(xor_loop_up_l1) BICS a4,a3,#3 /* set counter to multiple of 4 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1-v5,lr} /* save work regs */ LABEL(xor_loop_up_l2) LDMIA a2!,{a3,v1,v2,ip} /* load 4 words in one go */ @@ -583,7 +583,7 @@ LABEL(xor_loop_up_l2) STMIA a1!,{v3,v4,v5,lr} /* store 4 results */ SUBS a4,a4,#4 /* decrement counter by 4 */ BGT xor_loop_up_l2 /* if count still positive then loop */ - LDMFD sp!,{v1-v5,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v5,pc} /* restore work regs and return */ /* extern void and_loop_up (uintD* xptr, uintD* yptr, uintC count); entry @@ -613,7 +613,7 @@ GLABEL(and_loop_up) STRGT ip,[a1],#4 LABEL(and_loop_up_l1) BICS a4,a3,#3 /* set counter to multiple of 4 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1-v5,lr} /* save work regs */ LABEL(and_loop_up_l2) LDMIA a2!,{a3,v1,v2,ip} /* load 4 words in one go */ @@ -625,7 +625,7 @@ LABEL(and_loop_up_l2) STMIA a1!,{v3,v4,v5,lr} /* store 4 results */ SUBS a4,a4,#4 /* decrement counter by 4 */ BGT and_loop_up_l2 /* if count still positive then loop */ - LDMFD sp!,{v1-v5,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v5,pc} /* restore work regs and return */ /* extern void eqv_loop_up (uintD* xptr, uintD* yptr, uintC count); entry @@ -659,7 +659,7 @@ GLABEL(eqv_loop_up) STRGT ip,[a1],#4 LABEL(eqv_loop_up_l1) BICS a4,a3,#3 /* set counter to multiple of 4 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1-v5,lr} /* save work regs */ LABEL(eqv_loop_up_l2) LDMIA a2!,{a3,v1,v2,ip} /* load 4 words in one go */ @@ -675,7 +675,7 @@ LABEL(eqv_loop_up_l2) STMIA a1!,{v3,v4,v5,lr} /* store 4 results */ SUBS a4,a4,#4 /* decrement counter by 4 */ BGT eqv_loop_up_l2 /* if count still positive then loop */ - LDMFD sp!,{v1-v5,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v5,pc} /* restore work regs and return */ /* extern void nand_loop_up (uintD* xptr, uintD* yptr, uintC count); entry @@ -709,7 +709,7 @@ GLABEL(nand_loop_up) STRGT ip,[a1],#4 LABEL(nand_loop_up_l1) BICS a4,a3,#3 /* set counter to multiple of 4 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1-v5,lr} /* save work regs */ LABEL(nand_loop_up_l2) LDMIA a2!,{a3,v1,v2,ip} /* load 4 words in one go */ @@ -725,7 +725,7 @@ LABEL(nand_loop_up_l2) STMIA a1!,{v3,v4,v5,lr} /* store 4 results */ SUBS a4,a4,#4 /* decrement counter by 4 */ BGT nand_loop_up_l2 /* if count still positive then loop */ - LDMFD sp!,{v1-v5,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v5,pc} /* restore work regs and return */ /* extern void nor_loop_up (uintD* xptr, uintD* yptr, uintC count); entry @@ -759,7 +759,7 @@ GLABEL(nor_loop_up) STRGT ip,[a1],#4 LABEL(nor_loop_up_l1) BICS a4,a3,#3 /* set counter to multiple of 4 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1-v5,lr} /* save work regs */ LABEL(nor_loop_up_l2) LDMIA a2!,{a3,v1,v2,ip} /* load 4 words in one go */ @@ -775,7 +775,7 @@ LABEL(nor_loop_up_l2) STMIA a1!,{v3,v4,v5,lr} /* store 4 results */ SUBS a4,a4,#4 /* decrement counter by 4 */ BGT nor_loop_up_l2 /* if count still positive then loop */ - LDMFD sp!,{v1-v5,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v5,pc} /* restore work regs and return */ /* extern void andc2_loop_up (uintD* xptr, uintD* yptr, uintC count); entry @@ -805,7 +805,7 @@ GLABEL(andc2_loop_up) STRGT ip,[a1],#4 LABEL(andc2_loop_up_l1) BICS a4,a3,#3 /* set counter to multiple of 4 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1-v5,lr} /* save work regs */ LABEL(andc2_loop_up_l2) LDMIA a2!,{a3,v1,v2,ip} /* load 4 words in one go */ @@ -817,7 +817,7 @@ LABEL(andc2_loop_up_l2) STMIA a1!,{v3,v4,v5,lr} /* store 4 results */ SUBS a4,a4,#4 /* decrement counter by 4 */ BGT andc2_loop_up_l2 /* if count still positive then loop */ - LDMFD sp!,{v1-v5,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v5,pc} /* restore work regs and return */ /* extern void orc2_loop_up (uintD* xptr, uintD* yptr, uintC count); entry @@ -851,7 +851,7 @@ GLABEL(orc2_loop_up) STRGT ip,[a1],#4 LABEL(orc2_loop_up_l1) BICS a4,a3,#3 /* set counter to multiple of 4 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1-v5,lr} /* save work regs */ LABEL(orc2_loop_up_l2) LDMIA a2!,{a3,v1,v2,ip} /* load 4 words in one go */ @@ -867,7 +867,7 @@ LABEL(orc2_loop_up_l2) STMIA a1!,{v3,v4,v5,lr} /* store 4 results */ SUBS a4,a4,#4 /* decrement counter by 4 */ BGT orc2_loop_up_l2 /* if count still positive then loop */ - LDMFD sp!,{v1-v5,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v5,pc} /* restore work regs and return */ /* extern void not_loop_up (uintD* xptr, uintC count); entry @@ -893,7 +893,7 @@ GLABEL(not_loop_up) STRGT a3,[a1],#4 LABEL(not_loop_up_l1) BICS a4,a2,#3 /* set counter to multiple of 4 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{lr} /* save work regs */ LABEL(not_loop_up_l2) LDMIA a1,{a2,a3,ip,lr} /* load 4 words in one go,NO writeback */ @@ -904,7 +904,7 @@ LABEL(not_loop_up_l2) STMIA a1!,{a2,a3,ip,lr} /* store 4 results */ SUBS a4,a4,#4 /* decrement counter by 4 */ BGT not_loop_up_l2 /* if count still positive then loop */ - LDMFD sp!,{pc}^ /* restore work regs and return */ + LDMFD sp!,{pc} /* restore work regs and return */ /* extern void and_test_loop_up (uintD* xptr, uintD* yptr, uintC count); entry @@ -923,13 +923,13 @@ GLABEL(and_test_loop_up) LDR ip,[a1],#4 /* to align the total to a multiple */ TST ip,a4 /* of 4 words */ MOVNE a1,#1 /* return true if AND_TEST ok */ - MOVNES pc,lr + BXNE lr BCC and_test_loop_up_l1 /* better to branch than skip instrs. */ LDRGE a4,[a2],#4 LDRGE ip,[a1],#4 TSTGE ip,a4 MOVNE a1,#1 - MOVNES pc,lr + BXNE lr ANDS a4,a3,#3 CMP a4,#2 BLE and_test_loop_up_l1 /* better to branch than skip instrs. */ @@ -937,11 +937,11 @@ GLABEL(and_test_loop_up) LDRGT ip,[a1],#4 TSTGT ip,a4 MOVNE a1,#1 - MOVNES pc,lr + BXNE lr LABEL(and_test_loop_up_l1) BICS a4,a3,#3 /* set counter to multiple of 4 */ MOVEQ a1,#0 /* return false */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1-v6,lr} /* save work regs */ MOV v6,a1 /* move xptr to v6 */ MOV a1,#1 /* set result to true */ @@ -952,11 +952,11 @@ LABEL(and_test_loop_up_l2) TSTEQ v4,v1 TSTEQ v5,v2 TSTEQ lr,ip - LDMNEFD sp!,{v1-v6,pc}^ + LDMNEFD sp!,{v1-v6,pc} SUBS a4,a4,#4 /* decrement counter by 4 */ BGT and_test_loop_up_l2 /* if count still positive then loop */ MOV a1,#0 - LDMFD sp!,{v1-v6,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v6,pc} /* restore work regs and return */ /* extern void test_loop_up (uintD* xptr, uintC count); entry @@ -973,21 +973,21 @@ GLABEL(test_loop_up) BEQ test_loop_up_l1 /* yup, so branch */ LDR a4,[ip],#4 /* TEST the first 1-3 words */ TEQ a4,#0 /* align the total to a multiple of 4 */ - MOVNES pc,lr /* return true if AND_TEST ok */ + BXNE lr /* return true if AND_TEST ok */ CMP a3,#2 BLT test_loop_up_l1 /* need to branch 'cos PSR set */ LDRGE a4,[ip],#4 /* when checking against zero */ TEQGE a4,#0 - MOVNES pc,lr + BXNE lr CMP a3,#2 BLE test_loop_up_l1 /* need to branch 'cos PSR set */ LDRGT a4,[ip],#4 /* when checking against zero */ TEQGT a4,#0 - MOVNES pc,lr + BXNE lr LABEL(test_loop_up_l1) BICS a4,a2,#3 /* set counter to multiple of 4 */ MOVEQ a1,#0 /* return false */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1,lr} /* save work regs */ LABEL(test_loop_up_l2) LDMIA ip!,{a2,a3,v1,lr} /* load 4 words in one go */ @@ -995,11 +995,11 @@ LABEL(test_loop_up_l2) TEQEQ a3,#0 TEQEQ v1,#0 TEQEQ lr,#0 - LDMNEFD sp!,{v1,pc}^ + LDMNEFD sp!,{v1,pc} SUBS a4,a4,#4 /* decrement counter by 4 */ BGT test_loop_up_l2 /* if count still positive then loop */ MOV a1,#0 - LDMFD sp!,{v1,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1,pc} /* restore work regs and return */ /* extern void compare_loop_up (uintD* xptr, uintD* yptr, uintC count); entry @@ -1021,7 +1021,7 @@ GLABEL(compare_loop_up) CMP ip,a4 /* of 4 words */ MVNLO a1,#0 /* x < y -> -1 */ MOVHI a1,#1 /* x > y -> +1 */ - MOVNES pc,lr /* and return result if not equal */ + BXNE lr /* and return result if not equal */ ANDS a4,a3,#3 CMP a4,#2 BLT compare_loop_up_l1 /* need to branch 'cos PSR used */ @@ -1030,7 +1030,7 @@ GLABEL(compare_loop_up) CMP ip,a4 MVNLO a1,#0 MOVHI a1,#1 - MOVNES pc,lr + BXNE lr ANDS a4,a3,#3 CMP a4,#2 BLE compare_loop_up_l1 /* need to branch 'cos PSR used */ @@ -1039,11 +1039,11 @@ GLABEL(compare_loop_up) CMP ip,a4 MVNLO a1,#0 MOVHI a1,#1 - MOVNES pc,lr + BXNE lr LABEL(compare_loop_up_l1) BICS a4,a3,#3 /* set counter to multiple of 4 */ MOVEQ a1,#0 /* xptr[] == yptr[] -> 0 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1-v6,lr} /* save work regs */ MOV v6,a1 /* move xptr to v6 */ MOV a1,#1 /* set result to +1 */ @@ -1055,11 +1055,11 @@ LABEL(compare_loop_up_l2) CMPEQ v5,v2 CMPEQ lr,ip MVNLO a1,#0 /* x < y -> -1 (a1 already holds +1) */ - LDMNEFD sp!,{v1-v6,pc}^ + LDMNEFD sp!,{v1-v6,pc} SUBS a4,a4,#4 /* decrement counter by 4 */ BGT compare_loop_up_l2 /* if count still positive then loop */ MOV a1,#0 - LDMFD sp!,{v1-v6,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v6,pc} /* restore work regs and return */ /* extern uintD addto_loop_down (uintD* sourceptr, uintD* destptr, uintC count); entry @@ -1111,11 +1111,11 @@ LABEL(add_loop_down_l0) /* at l BICS a4,a4,#3 /* set counter to multiple of 4 */ BNE add_loop_down_l3 /* branch if more adds to do */ ADCEQ a1,a4,a4 /* set result to Carry (a4 is 0) */ - LDMEQFD sp!,{v6,pc}^ /* and return */ + LDMEQFD sp!,{v6,pc} /* and return */ LABEL(add_loop_down_l1) BICS a4,a4,#3 /* set counter to multiple of 4 */ MOVEQ a1,#0 /* no adds, so C = 0 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ CMN a4,#0 /* clear carry bit */ STMFD sp!,{v6,lr} LABEL(add_loop_down_l3) @@ -1132,7 +1132,7 @@ LABEL(add_loop_down_l2) TEQ a4,#0 /* are we done ? */ BNE add_loop_down_l2 /* if count non-zero then loop */ ADC a1,a4,a4 /* set result to Carry (a4 is 0) */ - LDMFD sp!,{v1-v6,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v6,pc} /* restore work regs and return */ /* extern uintD inc_loop_down (uintD* ptr, uintC count); entry @@ -1150,11 +1150,11 @@ GLABEL(inc_loop_down) ADDS a4,a4,#1 /* align the total to a multiple of 2 */ STR a4,[a1] MOVNE a1,#0 /* set result to 0 */ - MOVNES pc,lr /* return 0 if non-zero result */ + BXNE lr /* return 0 if non-zero result */ LABEL(inc_loop_down_l1) BICS a4,a2,#1 /* set counter to multiple of 2 */ MOVEQ a1,#1 /* return 1 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ MOV ip,a1 /* move ptr to ip */ MOV a1,#0 /* set result to 0 */ ANDS a3,a4,#3 @@ -1163,10 +1163,10 @@ LABEL(inc_loop_down_l1) ADDS a3,a3,#1 /* INC the two words */ ADDEQS a2,a2,#1 /* stopping when first word non-zero */ STMDB ip!,{a2,a3} /* store 2 results */ - MOVNES pc,lr /* return 0 if any result non-zero */ + BXNE lr /* return 0 if any result non-zero */ SUBS a4,a4,#2 /* decrement counter by 2 */ MOVEQ a1,#1 /* if finished loop then */ - MOVEQS pc,lr /* return 1 */ + BXEQ lr /* return 1 */ LABEL(inc_loop_down_l3) /* now a multiple of 4 words */ STMFD sp!,{v1,lr} /* save work regs */ LABEL(inc_loop_down_l2) @@ -1176,11 +1176,11 @@ LABEL(inc_loop_down_l2) ADDEQS a3,a3,#1 ADDEQS a2,a2,#1 STMDB ip!,{a2,a3,v1,lr} /* store 4 results */ - LDMNEFD sp!,{v1,pc}^ /* return 0 if any result non-zero */ + LDMNEFD sp!,{v1,pc} /* return 0 if any result non-zero */ SUBS a4,a4,#4 /* decrement counter by 4 */ BGT inc_loop_down_l2 /* if count still positive then loop */ MOV a1,#1 - LDMFD sp!,{v1,pc}^ /* restore work regs and return 1 */ + LDMFD sp!,{v1,pc} /* restore work regs and return 1 */ /* extern uintD sub_loop_down (uintD* sourceptr1, uintD* sourceptr2, uintD* destptr, uintC count); entry @@ -1206,7 +1206,7 @@ GLABEL(sub_loop_down) LABEL(sub_loop_down_l4) /* drop through for better instr. timings */ BICS a4,a4,#3 /* set counter to multiple of 4 */ SBCEQ a1,a4,a4 /* set result to Carry (a4 is 0) */ - LDMEQFD sp!,{v6,pc}^ /* and return */ + LDMEQFD sp!,{v6,pc} /* and return */ STMFD sp!,{v1-v5} /* save work regs */ B sub_loop_down_l2 /* branch if more subtracts to do */ LABEL(sub_loop_down_l0) @@ -1224,7 +1224,7 @@ LABEL(sub_loop_down_l0) LABEL(sub_loop_down_l1) BICS a4,a4,#3 /* set counter to multiple of 4 */ MOVEQ a1,#0 /* no subtracts, so C = 0 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ CMP a4,#0 /* set carry bit, since a4 > 0 */ STMFD sp!,{v1-v6,lr} /* save work regs */ LABEL(sub_loop_down_l2) @@ -1239,7 +1239,7 @@ LABEL(sub_loop_down_l2) TEQ a4,#0 /* are we done ? */ BNE sub_loop_down_l2 /* if count non-zero then loop */ SBC a1,a4,a4 /* set result to Carry (a4 is 0) */ - LDMFD sp!,{v1-v6,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v6,pc} /* restore work regs and return */ /* extern uintD subx_loop_down (uintD* sourceptr1, uintD* sourceptr2, uintD* destptr, uintC count, uintD carry); entry @@ -1269,7 +1269,7 @@ LABEL(subx_loop_down_lsub) LABEL(subx_loop_down_l4) /* drop through for better instr. timings */ BICS a4,a4,#3 /* set counter to multiple of 4 */ SBCEQ a1,a4,a4 /* set result to Carry (a4 is 0) */ - LDMEQFD sp!,{v6,pc}^ /* and return */ + LDMEQFD sp!,{v6,pc} /* and return */ STMFD sp!,{v1-v5} /* save work regs */ B subx_loop_down_l2 /* branch if more subtracts to do */ LABEL(subx_loop_down_l0) @@ -1287,7 +1287,7 @@ LABEL(subx_loop_down_l0) LABEL(subx_loop_down_l1) BICS a4,a4,#3 /* set counter to multiple of 4 */ SBCEQ a1,a4,a4 /* set result to Carry (a4 is 0) */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{v1-v6,lr} /* save work regs */ LABEL(subx_loop_down_l2) LDMDB a2!,{v1,v2,v3,ip} /* load 4 words in one go */ @@ -1301,7 +1301,7 @@ LABEL(subx_loop_down_l2) TEQ a4,#0 /* are we done ? */ BNE subx_loop_down_l2 /* if count non-zero then loop */ SBC a1,a4,a4 /* set result to Carry (a4 is 0) */ - LDMFD sp!,{v1-v6,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v6,pc} /* restore work regs and return */ /* extern uintD subfrom_loop_down (uintD* sourceptr, uintD* destptr, uintC count); entry @@ -1326,7 +1326,7 @@ GLABEL(subfrom_loop_down) LABEL(subfrom_loop_down_l4) /* drop through for better instr. timings */ BICS a4,a3,#3 /* set counter to multiple of 4 */ SBCEQ a1,a4,a4 /* set result to Carry (a4 is 0) */ - LDMEQFD sp!,{pc}^ /* and return */ + LDMEQFD sp!,{pc} /* and return */ STMFD sp!,{v1-v5} /* save work regs */ B subfrom_loop_down_l2 /* branch if more subtracts to do */ LABEL(subfrom_loop_down_l0) @@ -1344,7 +1344,7 @@ LABEL(subfrom_loop_down_l0) LABEL(subfrom_loop_down_l1) BICS a4,a3,#3 /* set counter to multiple of 4 */ MOVEQ a1,#0 /* no subtracts, so C = 0 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ CMP a4,#0 /* set carry bit, since a4 > 0 */ STMFD sp!,{v1-v5,lr} /* save work regs */ LABEL(subfrom_loop_down_l2) @@ -1359,7 +1359,7 @@ LABEL(subfrom_loop_down_l2) TEQ a4,#0 /* are we done ? */ BNE subfrom_loop_down_l2 /* if count non-zero then loop */ SBC a1,a4,a4 /* set result to Carry (a4 is 0) */ - LDMFD sp!,{v1-v5,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v5,pc} /* restore work regs and return */ /* extern uintD dec_loop_down (uintD* ptr, uintC count); entry @@ -1377,11 +1377,11 @@ GLABEL(dec_loop_down) SUBS a4,a4,#1 /* align the total to a multiple of 2 */ STR a4,[a1] MOVCS a1,#0 /* set result to 0 */ - MOVCSS pc,lr /* return 0 if non-zero result */ + BXCS lr /* return 0 if non-zero result */ LABEL(dec_loop_down_l1) BICS a4,a2,#1 /* set counter to multiple of 2 */ MVNEQ a1,#0 /* return -1 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ MOV ip,a1 /* move ptr to ip */ MOV a1,#0 /* set result to 0 */ ANDS a3,a4,#3 @@ -1390,10 +1390,10 @@ LABEL(dec_loop_down_l1) SUBS a3,a3,#1 /* DEC the two words */ SUBCCS a2,a2,#1 /* stopping when first word non-zero */ STMDB ip!,{a2,a3} /* store 2 results */ - MOVCSS pc,lr /* return 0 if any result non-zero */ + BXCS lr /* return 0 if any result non-zero */ SUBS a4,a4,#2 /* decrement counter by 2 */ MVNEQ a1,#0 /* if finished loop then */ - MOVEQS pc,lr /* return -1 */ + BXEQ lr /* return -1 */ LABEL(dec_loop_down_l3) /* now a multiple of 4 words */ STMFD sp!,{v1,lr} /* save work regs */ LABEL(dec_loop_down_l2) @@ -1403,11 +1403,11 @@ LABEL(dec_loop_down_l2) SUBCCS a3,a3,#1 SUBCCS a2,a2,#1 STMDB ip!,{a2,a3,v1,lr} /* store 4 results */ - LDMCSFD sp!,{v1,pc}^ /* return 0 if any carry */ + LDMCSFD sp!,{v1,pc} /* return 0 if any carry */ SUBS a4,a4,#4 /* decrement counter by 4 */ BGT dec_loop_down_l2 /* if count still positive then loop */ MVN a1,#0 - LDMFD sp!,{v1,pc}^ /* restore work regs and return -1 */ + LDMFD sp!,{v1,pc} /* restore work regs and return -1 */ /* extern void neg_loop_down (uintD* ptr, uintC count); entry @@ -1421,7 +1421,7 @@ LABEL(dec_loop_down_l2) GLABEL(neg_loop_down) CMPS a2,#0 /* count = 0 ? */ MOVEQ a1,#0 /* yup, so return 0 */ - MOVEQS pc,lr + BXEQ lr LABEL(neg_loop_down_l1) /* skip all the zero words first */ LDR a3,[a1,#-4]! /* compare words against zero */ CMPS a3,#0 /* downwards in memory */ @@ -1429,13 +1429,13 @@ LABEL(neg_loop_down_l1) /* skip SUBS a2,a2,#1 /* reduce count of words */ BNE neg_loop_down_l1 /* more ?, so loop */ MOV a1,#0 /* return 0 */ - MOVS pc,lr + BX lr LABEL(neg_loop_down_l2) RSB a3,a3,#0 /* first non-zero word = -word */ STR a3,[a1] SUBS a2,a2,#1 MVNEQ a1,#0 /* done ? -> return -1 */ - MOVEQS pc,lr + BXEQ lr /* now NOT rest of the words */ ANDS a3,a2,#3 /* multiple of 4 words ? */ BEQ neg_loop_down_l3 /* yup, so branch */ @@ -1453,7 +1453,7 @@ LABEL(neg_loop_down_l2) LABEL(neg_loop_down_l3) BICS a4,a2,#3 /* set counter to multiple of 4 */ MVNEQ a1,#0 /* set result to -1 */ - MOVEQS pc,lr /* if zero then we're done */ + BXEQ lr /* if zero then we're done */ STMFD sp!,{lr} /* save work regs */ LABEL(neg_loop_down_l4) LDMDB a1,{a2,a3,ip,lr} /* load 4 words in one go,NO writeback */ @@ -1465,7 +1465,7 @@ LABEL(neg_loop_down_l4) SUBS a4,a4,#4 /* decrement counter by 4 */ BGT neg_loop_down_l4 /* if count still positive then loop */ MVN a1,#0 /* set result to -1 */ - LDMFD sp!,{pc}^ /* restore work regs and return -1 */ + LDMFD sp!,{pc} /* restore work regs and return -1 */ /* extern uintD shift1left_loop_down (uintD* ptr, uintC count); entry @@ -1485,7 +1485,7 @@ GLABEL(shift1left_loop_down) LABEL(shift1left_loop_down_l1) BICS a4,a2,#1 /* set counter to multiple of 2 */ ADCEQ a1,a4,a4 /* if zero set result to C (a4 is 0) */ - MOVEQS pc,lr /* and return */ + BXEQ lr /* and return */ ANDS a3,a4,#3 /* multiple of 4 words ? */ BEQ shift1left_loop_down_l3 /* yup, so branch */ LDMDB a1,{a2,a3} /* load 2 words in one go */ @@ -1494,7 +1494,7 @@ LABEL(shift1left_loop_down_l1) STMDB a1!,{a2,a3} /* store 2 results */ BICS a4,a4,#2 /* decrement counter by 2 */ ADCEQ a1,a4,a4 /* set result to Carry (a4 is 0) */ - MOVEQS pc,lr /* and return */ + BXEQ lr /* and return */ LABEL(shift1left_loop_down_l3) /* now a multiple of 4 words */ STMFD sp!,{lr} /* save work regs */ LABEL(shift1left_loop_down_l2) @@ -1508,7 +1508,7 @@ LABEL(shift1left_loop_down_l2) TEQ a4,#0 /* are we done ? */ BNE shift1left_loop_down_l2 /* if count non-zero then loop */ ADC a1,a4,a4 /* set result to Carry (a4 is 0) */ - LDMFD sp!,{pc}^ /* restore work regs and return 1 */ + LDMFD sp!,{pc} /* restore work regs and return 1 */ /* extern uintD shiftleft_loop_down (uintD* ptr, uintC count, uintC i, uintD carry); entry @@ -1542,7 +1542,7 @@ GLABEL(shiftleft_loop_down) LABEL(shiftleft_loop_down_l1) BICS ip,a2,#3 /* set counter to multiple of 4 */ MOVEQ a1,a4 /* if zero then we're done */ - LDMEQFD sp!,{v6,pc}^ /* so return last shift out */ + LDMEQFD sp!,{v6,pc} /* so return last shift out */ STMFD sp!,{v1-v3} /* save work regs */ LABEL(shiftleft_loop_down_l2) LDMDB a1,{a2,v1,v2,v3} /* load 4 words in one go */ @@ -1558,7 +1558,7 @@ LABEL(shiftleft_loop_down_l2) SUBS ip,ip,#4 /* decrement counter by 4 */ BGT shiftleft_loop_down_l2 /* if count still positive then loop */ MOV a1,a4 /* result = last shift out */ - LDMFD sp!,{v1-v3,v6,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v3,v6,pc} /* restore work regs and return */ /* extern uintD shiftleftcopy_loop_down (uintD* sourceptr, uintD* destptr, uintC count, uintC i); entry @@ -1593,7 +1593,7 @@ GLABEL(shiftleftcopy_loop_down) LABEL(shiftleftcopy_loop_down_l1) BICS ip,a3,#3 /* set counter to multiple of 4 */ MOVEQ a1,v5 /* if zero then we're done */ - LDMEQFD sp!,{v5,v6,pc}^ /* so return last shift out */ + LDMEQFD sp!,{v5,v6,pc} /* so return last shift out */ STMFD sp!,{v1-v3} /* save work regs */ LABEL(shiftleftcopy_loop_down_l2) LDMDB a1!,{a3,v1,v2,v3} /* load 4 words in one go */ @@ -1609,7 +1609,7 @@ LABEL(shiftleftcopy_loop_down_l2) SUBS ip,ip,#4 /* decrement counter by 4 */ BGT shiftleftcopy_loop_down_l2 /* if count still positive then loop */ MOV a1,v5 /* result = last shift out */ - LDMFD sp!,{v1-v3,v5,v6,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v3,v5,v6,pc} /* restore work regs and return */ /* extern uintD shift1right_loop_up (uintD* ptr, uintC count, uintD carry); entry @@ -1630,7 +1630,7 @@ GLABEL(shift1right_loop_up) LABEL(shift1right_loop_up_l1) BICS a4,a2,#1 /* set counter to multiple of 2 */ MOVEQ a1,a4,RRX /* if zero set result to C (a4 is 0) */ - MOVEQS pc,lr /* and return */ + BXEQ lr /* and return */ ANDS a3,a4,#3 /* multiple of 4 words ? */ BEQ shift1right_loop_up_l3 /* yup, so branch */ LDMIA a1,{a2,a3} /* load 2 words in one go */ @@ -1639,7 +1639,7 @@ LABEL(shift1right_loop_up_l1) STMIA a1!,{a2,a3} /* store 2 results */ BICS a4,a4,#2 /* decrement counter by 2 */ ADCEQ a1,a4,a4 /* set result to Carry (a4 is 0) */ - MOVEQS pc,lr /* and return */ + BXEQ lr /* and return */ LABEL(shift1right_loop_up_l3) /* now a multiple of 4 words */ STMFD sp!,{lr} /* save work regs */ LABEL(shift1right_loop_up_l2) @@ -1653,7 +1653,7 @@ LABEL(shift1right_loop_up_l2) TEQ a4,#0 /* are we done ? */ BNE shift1right_loop_up_l2 /* if count non-zero then loop */ MOV a1,a4,RRX /* set result to Carry (a4 is 0) */ - LDMFD sp!,{pc}^ /* restore work regs and return 1 */ + LDMFD sp!,{pc} /* restore work regs and return 1 */ /* extern uintD shiftright_loop_up (uintD* ptr, uintC count, uintC i); entry @@ -1688,7 +1688,7 @@ LABEL(shiftright_loop_up_l0) LABEL(shiftright_loop_up_l1) BICS ip,a2,#3 /* set counter to multiple of 4 */ MOVEQ a1,a4 /* if zero then we're done */ - LDMEQFD sp!,{v6,pc}^ /* so return last shift out */ + LDMEQFD sp!,{v6,pc} /* so return last shift out */ STMFD sp!,{v1-v3} /* save work regs */ LABEL(shiftright_loop_up_l2) LDMIA a1,{v1,v2,v3,lr} /* load 4 words in one go */ @@ -1704,7 +1704,7 @@ LABEL(shiftright_loop_up_l2) SUBS ip,ip,#4 /* decrement counter by 4 */ BGT shiftright_loop_up_l2 /* if count still positive then loop */ MOV a1,a4 /* result = last shift out */ - LDMFD sp!,{v1-v3,v6,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v3,v6,pc} /* restore work regs and return */ /* extern uintD shiftrightsigned_loop_up (uintD* ptr, uintC count, uintC i); entry @@ -1759,7 +1759,7 @@ LABEL(shiftrightcopy_loop_up_l0) LABEL(shiftrightcopy_loop_up_l1) BICS ip,a3,#3 /* set counter to multiple of 4 */ MOVEQ a1,v5 /* if zero then we're done */ - LDMEQFD sp!,{v5,v6,pc}^ /* so return last shift out */ + LDMEQFD sp!,{v5,v6,pc} /* so return last shift out */ STMFD sp!,{v1-v3} /* save work regs */ LABEL(shiftrightcopy_loop_up_l2) LDMIA a1!,{v1,v2,v3,lr} /* load 4 words in one go */ @@ -1775,7 +1775,7 @@ LABEL(shiftrightcopy_loop_up_l2) SUBS ip,ip,#4 /* decrement counter by 4 */ BGT shiftrightcopy_loop_up_l2 /* if count still positive then loop */ MOV a1,v5 /* result = last shift out */ - LDMFD sp!,{v1-v3,v5,v6,pc}^ /* restore work regs and return */ + LDMFD sp!,{v1-v3,v5,v6,pc} /* restore work regs and return */ #ifndef HAVE_umull /* mulu32_64_vregs @@ -1800,7 +1800,7 @@ LABEL(mulu32_64_vregs) ADDCS v2,v2,#0x10000 /* carry from above add */ ADDS v1,v4,ip,LSL #16 /* x is now bottom 32 bits of result */ ADC ip,v2,ip,LSR #16 /* hi is top 32 bits */ - MOVS pc,lr + BX lr #endif /* HAVE_umull */ /* extern uintD mulusmall_loop_down (uintD digit, uintD* ptr, uintC len, uintD newdigit); @@ -1816,7 +1816,7 @@ LABEL(mulu32_64_vregs) GLABEL(mulusmall_loop_down) CMP a3,#0 MOVEQ a1,a4 - MOVEQS pc,lr + BXEQ lr #ifdef HAVE_umull STMFD sp!,{v1,lr} LABEL(mulusmall_loop_down_l1) @@ -1828,7 +1828,7 @@ LABEL(mulusmall_loop_down_l1) SUBS a3,a3,#1 /* len-- */ BNE mulusmall_loop_down_l1 /* until len==0 */ MOV a1,a4 /* return carry */ - LDMFD sp!,{v1,pc}^ + LDMFD sp!,{v1,pc} #else STMFD sp!,{v1-v2,lr} LABEL(mulusmall_loop_down_l1) @@ -1850,7 +1850,7 @@ LABEL(mulusmall_loop_down_l1) SUBS a3,a3,#1 /* len-- */ BNE mulusmall_loop_down_l1 /* until len==0 */ MOV a1,a4 /* return carry */ - LDMFD sp!,{v1-v2,pc}^ + LDMFD sp!,{v1-v2,pc} #endif /* extern void mulu_loop_down (uintD digit, uintD* sourceptr, uintD* destptr, uintC len); @@ -1875,7 +1875,7 @@ LABEL(mulu_loop_down_l1) SUBS a4,a4,#1 /* len-- */ BNE mulu_loop_down_l1 /* until len==0 */ STR v5,[a3,#-4]! /* *--destptr = carry */ - LDMFD sp!,{v1,v5,pc}^ + LDMFD sp!,{v1,v5,pc} #else STMFD sp!,{v1-v5,lr} MOV v5,#0 @@ -1888,7 +1888,7 @@ LABEL(mulu_loop_down_l1) SUBS a4,a4,#1 /* len-- */ BNE mulu_loop_down_l1 /* until len==0 */ STR v5,[a3,#-4]! /* *--destptr = carry */ - LDMFD sp!,{v1-v5,pc}^ + LDMFD sp!,{v1-v5,pc} #endif /* extern void muluadd_loop_down (uintD digit, uintD* sourceptr, uintD* destptr, uintC len); @@ -1916,7 +1916,7 @@ LABEL(muluadd_loop_down_l1) SUBS a4,a4,#1 /* len-- */ BNE muluadd_loop_down_l1 /* until len==0 */ MOV a1,v5 /* return carry */ - LDMFD sp!,{v1,v5,pc}^ + LDMFD sp!,{v1,v5,pc} #else STMFD sp!,{v1-v5,lr} MOV v5,#0 @@ -1932,7 +1932,7 @@ LABEL(muluadd_loop_down_l1) SUBS a4,a4,#1 /* len-- */ BNE muluadd_loop_down_l1 /* until len==0 */ MOV a1,v5 /* return carry */ - LDMFD sp!,{v1-v5,pc}^ + LDMFD sp!,{v1-v5,pc} #endif /* extern void mulusub_loop_down (uintD digit, uintD* sourceptr, uintD* destptr, uintC len); @@ -1960,7 +1960,7 @@ LABEL(mulusub_loop_down_l1) SUBS a4,a4,#1 /* len-- */ BNE mulusub_loop_down_l1 /* until len==0 */ MOV a1,v5 /* return carry */ - LDMFD sp!,{v1,v5,pc}^ + LDMFD sp!,{v1,v5,pc} #else STMFD sp!,{v1-v5,lr} MOV v5,#0 @@ -1976,7 +1976,7 @@ LABEL(mulusub_loop_down_l1) SUBS a4,a4,#1 /* len-- */ BNE mulusub_loop_down_l1 /* until len==0 */ MOV a1,v5 /* return carry */ - LDMFD sp!,{v1-v5,pc}^ + LDMFD sp!,{v1-v5,pc} #endif END debian/patches/bdb-5.1.patch0000664000000000000000000000470512317455203012700 0ustar Description: Reflect the fact that Berkeley DB 5.1 no longer supports RPC See docs/installation/changelog_4_8.html in src:db package. . This patch removes RPC support in BDB:DBE-CREATE. The function now fails with an error message if a remote host is given. Bug-Debian: http://bugs.debian.org/621377 Forwarded: no Author: Sébastien Villemot Last-Update: 2012-02-17 --- a/modules/berkeley-db/bdb.c +++ b/modules/berkeley-db/bdb.c @@ -351,40 +351,10 @@ DEFUN(BDB:DBE-CREATE,&key PASSWORD ENCRYPT :HOST CLIENT-TIMEOUT SERVER-TIMEOUT) { /* Create an environment handle */ DB_ENV *dbe, *dbe_cl; - bool remote_p = boundp(STACK_2); /* host ==> remote */ + if (boundp(STACK_2)) /* :HOST */ + error(error_condition, GETTEXT("RPC support has been dropped in Berkeley DB 5.1")); int cl_timeout = 0, sv_timeout = 0; -# if defined(DB_RPCCLIENT) /* 4.2 and later */ - SYSCALL(db_env_create,(&dbe,remote_p ? DB_RPCCLIENT : 0)); -# 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? -# endif - if (remote_p) { - 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: - if (stringp(STACK_2)) { /* string host */ - with_string_0(STACK_2,GLO(misc_encoding),hostz, { - SYSCALL(dbe->set_rpc_server,(dbe,NULL,hostz,cl_timeout,sv_timeout,0)); - }); - } else if ((dbe_cl = (DB_ENV*)bdb_handle(STACK_2,`BDB::DBE`, - BH_NIL_IS_NULL))) { - /* reuse client */ - SYSCALL(dbe->set_rpc_server,(dbe,dbe_cl->cl_handle,NULL, - cl_timeout,sv_timeout,0)); - } else { /* bad host */ - pushSTACK(NIL); /* no PLACE */ - pushSTACK(STACK_(2+1)); /* TYPE-ERROR slot DATUM */ - pushSTACK(`(OR STRING BDB::DBE)`); /* TYPE-ERROR slot EXPECTED-TYPE */ - pushSTACK(STACK_2); /* host */ - pushSTACK(`BDB::DBE`); pushSTACK(S(string)); pushSTACK(S(Khost)); - pushSTACK(TheSubr(subr_self)->name); - check_value(type_error,GETTEXT("~S: ~S should be a ~S or a ~S, not ~S")); - STACK_2 = value1; - goto host_restart; - } - } + SYSCALL(db_env_create,(&dbe,0)); if (!missingp(STACK_4)) /* :PASSWD */ dbe_set_encryption(dbe,&STACK_3,&STACK_4); skipSTACK(5); debian/patches/ignore-directory-encoding-errors.patch0000664000000000000000000000302312317455203020223 0ustar Description: ignore errors due to encoding of file Author: Sam Steingold Origin: http://thread.gmane.org/gmane.lisp.clisp.devel/21975/focus=21978 Bug-Debian: http://bugs.debian.org/443520 Forwarded: not-needed --- clisp.orig/src/init.lisp +++ clisp/src/init.lisp @@ -1570,6 +1570,10 @@ (apply #'format *error-output* format-string args) (elastic-newline *error-output*) nil)))) + +(unless (fboundp 'ext::muffle-cerrors) ; predef for bootstrap + (sys::%putd 'ext::muffle-cerrors #'identity)) + (defun open-for-load (filename extra-file-types external-format &aux stream (present-files t) obj path bad-file) (block open-for-load @@ -1639,11 +1643,12 @@ ;; File with precisely this name not present OR bad ;; Search among the files the most recent one ;; with the same name and the Extensions "LISP", "FAS": - (setq present-files (search-file filename - (append extra-file-types + (setq present-files + (ext::muffle-cerrors ; ignore encoding errors in DIRECTORY + (search-file filename (append extra-file-types *compiled-file-types* *source-file-types*) - nil))) + nil)))) (if present-files ;; proceed with the next present file (setq path (car present-files) present-files (cdr present-files) debian/patches/series0000664000000000000000000000024312317455203012035 0ustar ignore-directory-encoding-errors.patch clisp-link.patch clx-spelling.patch s390x-workaround.patch kfreebsd-amd64.diff bdb-5.1.patch arm-sf.patch eglibc-2.17.patch debian/patches/eglibc-2.17.patch0000664000000000000000000000310012317455203013446 0ustar Description: Fix build with eglibc 2.17 With eglibc2.17 the build failed with a couple of errors . The first error was #error "Never use directly; include instead." So after working out where linux.c was generated from I made the change suggested in the error message. . The second error was linux.c:613:47: error: '__swblk_t' undeclared (first use in this function) After some googling I found the advice at http://sourceforge.net/mailarchive/message.php?msg_id=30446182 and removed which suggested removing it was the only sane option. Looking at the fact that glibc defined it differently on different platforms i'm inclined to agree and have removed it. Author: Peter Michael Green Bug-Debian: http://bugs.debian.org/701379 Index: clisp-2.49/modules/bindings/glibc/linux.lisp =================================================================== --- clisp-2.49.orig/modules/bindings/glibc/linux.lisp 2013-05-07 20:36:12.000000000 +0000 +++ clisp-2.49/modules/bindings/glibc/linux.lisp 2013-05-07 20:39:01.000000000 +0000 @@ -67,7 +67,6 @@ (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 __fd_mask ulong) (eval-when (load compile eval) @@ -86,7 +85,7 @@ (def-c-type __key_t) ; int -(c-lines "#include ~%") +(c-lines "#include ~%") (def-c-type __ipc_pid_t) ; ushort ; --------------------------- ----------------------------------- debian/patches/s390x-workaround.patch0000664000000000000000000000064412317455203014725 0ustar Index: clisp/src/build-aux/config.sub =================================================================== --- clisp.orig/src/build-aux/config.sub 2011-04-04 16:47:54.000000000 +0200 +++ clisp/src/build-aux/config.sub 2011-04-08 23:32:27.254284905 +0200 @@ -987,7 +987,7 @@ basic_machine=s390-ibm ;; s390x | s390x-*) - basic_machine=s390x-ibm + basic_machine=s390-ibm ;; sa29200) basic_machine=a29k-amd debian/patches/clx-spelling.patch0000664000000000000000000000064012317455203014243 0ustar Description: Stupid typo in clx Author: Peter Van Eynde Forwarded: not-needed --- clisp.orig/modules/clx/new-clx/clx.f +++ clisp/modules/clx/new-clx/clx.f @@ -3109,7 +3109,7 @@ } } else { pushSTACK(TheSubr (subr_self)->name); - error(error_condition,"~S: At least :DRAWABLE should be specifed."); + error(error_condition,"~S: At least :DRAWABLE should be specified."); } skipSTACK(26); } debian/clisp-module-clx.install0000664000000000000000000000014012317455203013736 0ustar usr/lib/clisp-2.49/clx usr/lib/clisp-2.49/dynmod/clx.lisp usr/lib/clisp-2.49/dynmod/lib-clx.so debian/preinst0000664000000000000000000000206212317455203010601 0ustar #! /bin/sh # preinst script for resample # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * `install' # * `install' # * `upgrade' # * `abort-upgrade' # # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package case "$1" in install|upgrade) # check for old mem files for previous installs: if [ -f /usr/lib/clisp/full/lispinit.mem ] || [ -f /usr/lib/clisp/full/lispinit.mem ] ; then [ -f /usr/lib/clisp/full/lispinit.mem ] && rm -f /usr/lib/clisp/full/lispinit.mem [ -f /usr/lib/clisp/full/lispinit.mem ] && rm /usr/lib/clisp/full/lispinit.mem rmdir /usr/lib/clisp/full/ || true rmdir /usr/lib/clisp/ || true fi ;; abort-upgrade) ;; *) echo "preinst called with unknown argument \`$1'" >&2 exit 1 ;; esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# exit 0 debian/clisp-module-zlib.install0000664000000000000000000000014212317455203014112 0ustar usr/lib/clisp-2.49/dynmod/lib-zlib.so usr/lib/clisp-2.49/dynmod/zlib.lisp usr/lib/clisp-2.49/zlib debian/clisp-module-postgresql.install0000664000000000000000000000016412317455203015361 0ustar usr/lib/clisp-2.49/dynmod/lib-postgresql.so usr/lib/clisp-2.49/dynmod/postgresql.lisp usr/lib/clisp-2.49/postgresql debian/clisp-module-gdbm.install0000664000000000000000000000014212317455203014063 0ustar usr/lib/clisp-2.49/dynmod/lib-gdbm.so usr/lib/clisp-2.49/dynmod/gdbm.lisp usr/lib/clisp-2.49/gdbm debian/clisp-module-berkeley-db.install0000664000000000000000000000014712317455203015344 0ustar usr/lib/clisp-2.49/berkeley-db usr/lib/clisp-2.49/dynmod/bdb.lisp usr/lib/clisp-2.49/dynmod/lib-bdb.so debian/copyright0000664000000000000000000001055712317455203011135 0ustar This package was originally debianized by Kevin Dalley on Thu, 22 May 1997 23:51:34 -0700. This package was redone from scratch by Matt Zimmerman on Sat, 11 Aug 2001 20:01:12 -0400. It was downloaded from clisp.sourceforge.net Copyright: On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. A complete copy of the COPYRIGHT file from the original source distribution follows here: Hey Emacs! -*- coding: utf-8 -*- Copyright (c) 1992-2009 Bruno Haible, Michael Stoll, Sam Steingold All Rights Reserved Summary: This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation; see file GNU-GPL. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Note: This copyright does NOT cover user programs that run in CLISP and third-party packages not part of CLISP, if a) They only reference external symbols in CLISP's public packages that define API also provided by many other Common Lisp implementations (namely the packages COMMON-LISP, COMMON-LISP-USER, KEYWORD, CLOS, GRAY, EXT), i.e. if they don't rely on CLISP internals and would as well run in any other Common Lisp implementation. Or b) They only reference external symbols in CLISP's public packages that define API also provided by many other Common Lisp implementations (namely the packages COMMON-LISP, COMMON-LISP-USER, KEYWORD, CLOS, GRAY, EXT) and some external, not CLISP specific, symbols in third-party packages that are released with source code under a GPL compatible license and that run in a great number of Common Lisp implementations, i.e. if they rely on CLISP internals only to the extent needed for gaining some functionality also available in a great number of Common Lisp implementations. Such user programs are not covered by the term "derived work" used in the GNU GPL. Neither is their compiled code, i.e. the result of compiling them by use of the function COMPILE-FILE. We refer to such user programs as "independent work". You may copy and distribute memory image files generated by the function SAVEINITMEM, if it was generated only from CLISP and independent work, and provided that you accompany them, in the sense of section 3 of the GNU GPL, with the source code of CLISP - precisely the same CLISP version that was used to build the memory image -, the source or compiled code of the user programs needed to rebuild the memory image (source code for all the parts that are not independent work, see above), and a precise description how to rebuild the memory image from these. Foreign non-Lisp code that is linked with CLISP or loaded into CLISP through dynamic linking is not exempted from this copyright. I.e. such code, when distributed for use with CLISP, must be distributed under the GPL. Authors: Generic CLISP: Bruno Haible, Michael Stoll Atari version: Bruno Haible, Michael Stoll Amiga version: Bruno Haible, Jörg Höhle Acorn version: Bruno Haible, Peter Burwood DOS version: Bruno Haible, Bernhard Degel, Jürgen Weber OS/2 version: Bruno Haible Unix version: Bruno Haible Multithreading: Vladimir Tzankov Maintenance: Bruno Haible, Michael Stoll 1992-1993 Bruno Haible, Marcus Daniels 1994-1997 Bruno Haible, Pierpaolo Bernardi, Sam Steingold 1998 Bruno Haible, Sam Steingold 1999-2001 Sam Steingold 2002-2009 Email addresses (September 1992 or newer): Bruno Haible bruno@clisp.org Michael Stoll michael@rhein.iam.uni-bonn.de Jörg Höhle Joerg-Cyril.Hoehle@t-systems.com Peter Burwood clisp@arcangel.dircon.co.uk Marcus Daniels marcus@sysc.pdx.edu Pierpaolo Bernardi bernardp@cli.di.unipi.it Sam Steingold sds@gnu.org debian/clisp-doc.install0000664000000000000000000000004512317455203012436 0ustar usr/share/doc/* usr/share/doc/clisp/ debian/source/0000775000000000000000000000000012317455607010502 5ustar debian/source/format0000664000000000000000000000001412317455203011700 0ustar 3.0 (quilt) debian/clisp-module-dbus.install0000664000000000000000000000014212317455203014107 0ustar usr/lib/clisp-2.49/dbus usr/lib/clisp-2.49/dynmod/dbus.lisp usr/lib/clisp-2.49/dynmod/lib-dbus.so