debian/0000775000000000000000000000000012321021640007157 5ustar debian/rules0000775000000000000000000001116212314253135010250 0ustar #!/usr/bin/make -f # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) # FOR AUTOCONF 2.52 AND NEWER ONLY ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += --build $(DEB_HOST_GNU_TYPE) else confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) endif #export CC=/usr/bin/gcc-4.1 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) CFLAGS += -g endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) # gengc doesn't work on ia64 right now -- check again for next version # actually gengc and threads don't work together accoding to upstream #ifneq ($(DEB_HOST_ARCH),ia64) # confflags += --enable-gengc #endif # force to use ginstall-info: export INSTALL_INFO=/usr/bin/ginstall-info config.status: configure dh_testdir dh_autotools-dev_updateconfig # Add here commands to configure the package. chmod a+x configure \ src/configure touch src/configure.in && \ touch src/aclocal.m4 && \ touch src/configure configure ./configure $(confflags) \ --prefix=/usr --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --with-system-gmp=yes \ --with-tcp \ --with-clx \ --enable-threads=yes \ --enable-boehm=system \ --with-x \ --enable-unicode touch config.status build: build-arch build-indep build-arch: build-arch-stamp build-arch-stamp: config.status dh_testdir -a $(MAKE) touch build-arch-stamp build-indep: build-indep-stamp build-indep-stamp: config.status dh_testdir -i # DISABLED -- doc not building # $(MAKE) -C build/doc touch build-indep-stamp clean: dh_testdir dh_testroot rm -f build-*-stamp # -test -r /usr/share/misc/config.sub && \ # cp -f /usr/share/misc/config.sub src/gc/config.sub # -test -r /usr/share/misc/config.guess && \ # cp -f /usr/share/misc/config.guess src/gc/config.guess # -test -r /usr/share/misc/config.sub && \ # cp -f /usr/share/misc/config.sub src/config.sub # -test -r /usr/share/misc/config.guess && \ # cp -f /usr/share/misc/config.guess src/config.guess # do this manually on a big change: # autoreconf --force # Add here commands to clean up after the build process. # correct lintian warning debian-rules-ignores-make-clean-error [ ! -f Makefile ] || $(MAKE) distclean rm -f src/gc/configure.in rm -rf build dh_autotools-dev_restoreconfig dh_clean install: build-arch dh_testdir -a dh_testroot -a dh_prep -a dh_installdirs -a # Add here commands to install the package into debian/ecl $(MAKE) install prefix=$(CURDIR)/debian/ecl/usr # DISABLED -- doc currently not building # # rm $(CURDIR)/debian/ecl/usr/share/doc/LGPL # rm $(CURDIR)/debian/ecl/usr/share/doc/Copyright # rm $(CURDIR)/debian/ecl/usr/share/info/ecl.info \ # $(CURDIR)/debian/ecl/usr/share/info/clx.info \ # $(CURDIR)/debian/ecl/usr/share/info/ecldev.info # rm $(CURDIR)/debian/ecl/usr/share/info/dir # rmdir $(CURDIR)/debian/ecl/usr/share/info # find $(CURDIR)/debian -name "*.lsp" -print0 | \ # xargs -0 chmod a-x || true # remove rpath from /us/lib/ecl/ binaries (bug #495756) # this is a workaround until upstream properly fixes it find $(CURDIR)/debian/ecl/usr/lib/ -name "*.fas" -print0 | \ xargs -0 chrpath -d chrpath -d $(CURDIR)/debian/ecl/usr/bin/ecl $(CURDIR)/debian/ecl/usr/lib/libecl.so.* cp debian/overrides.ecl $(CURDIR)/debian/ecl/usr/share/lintian/overrides/ecl # Build architecture-independent files here. binary-indep: build-indep dh_testdir -i dh_testroot -i dh_installdirs -i ls -l $(CURDIR)/debian/ecl-doc/usr/share/info/ dh_installdocs -i dh_installchangelogs -i # dh_installinfo -v -i dh_compress -i dh_fixperms -i dh_installdeb -i dh_gencontrol -i dh_md5sums -i dh_builddeb -i # Build architecture-dependent files here. binary-arch: build-arch install dh_testdir -a dh_testroot -a # dh_installdebconf dh_installdocs -a dh_installexamples -a dh_installmenu -a dh_installman -a # dh_undocumented dh_installchangelogs -a dh_link -a dh_strip -a dh_compress -a dh_fixperms -a # dh_lisp -a ecl dh_makeshlibs -a dh_installdeb -a dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a dh_builddeb -a binary: binary-indep binary-arch .PHONY: build build-arch build-indep clean binary-indep binary-arch binary install debian/watch0000664000000000000000000000007412314253135010221 0ustar version=3 http://sf.net/ecls/ecl-([0-9][0-9a-z.]*)\.t.*gz debian/NEWS0000664000000000000000000000034712314253135007672 0ustar ecl (11.1.1-1) experimental; urgency=low ECL 11.1.1 doesn't support common-lisp-controller any more. clc is scheduled to be replaced fully by asdf 2 -- Christoph Egger Fri, 04 Mar 2011 00:04:51 +0100 debian/changelog0000664000000000000000000003466112321021627011050 0ustar ecl (13.5.1+dfsg2-4.1ubuntu1) trusty; urgency=medium * Merge from Debian unstable. Remaining changes: - debian/rules: Enable unicode support. -- Logan Rosen Tue, 08 Apr 2014 12:27:34 -0400 ecl (13.5.1+dfsg2-4.1) unstable; urgency=medium * Non-maintainer upload. * Drop unnecessary build dep on automake1.9. (Closes: #724364) -- Eric Dorland Fri, 14 Mar 2014 23:16:45 -0400 ecl (13.5.1+dfsg2-4ubuntu1) trusty; urgency=medium * Merge from Debian unstable. Remaining changes: - debian/rules: Enable unicode support. -- Logan Rosen Sat, 28 Dec 2013 17:29:51 -0500 ecl (13.5.1+dfsg2-4) unstable; urgency=medium * Update config.* during build (Closes: #727368) * Activate CAS emulation for armel -- Christoph Egger Sat, 28 Dec 2013 17:44:38 +0100 ecl (13.5.1+dfsg2-2ubuntu1) trusty; urgency=medium * Merge from Debian unstable. Remaining changes: - debian/rules: + Enable unicode support. + Use autotools-dev to update config.{sub,guess} for new arches. -- Logan Rosen Sat, 28 Dec 2013 02:36:31 -0500 ecl (13.5.1+dfsg2-2) unstable; urgency=medium * Upload to unstable -- Christoph Egger Fri, 27 Dec 2013 15:44:12 +0100 ecl (13.5.1+dfsg2-1) unstable; urgency=medium * Remove libffi from tarball forcing the build system to use system libffi. This should fix the armel build -- Christoph Egger Mon, 23 Dec 2013 21:16:30 +0100 ecl (13.5.1+dfsg1-1ubuntu1) trusty; urgency=medium * Merge from Debian unstable. Remaining changes: - debian/rules: Enable unicode support. * Use autotools-dev to update config.{sub,guess} for new arches. -- Logan Rosen Thu, 26 Dec 2013 19:11:55 -0500 ecl (13.5.1+dfsg1-1) unstable; urgency=medium * Remove embedded libraries from source tarbal Closes: #708868 -- Christoph Egger Mon, 23 Dec 2013 14:32:07 +0100 ecl (13.5.1-1) experimental; urgency=low * New upstream release -- Christoph Egger Sun, 07 Jul 2013 11:24:52 +0200 ecl (12.12.1-3ubuntu1) saucy; urgency=low * Merge from Debian unstable (LP: #1040330). Remaining changes: - debian/rules: Enable unicode support. -- Mattia Rizzolo Thu, 18 Jul 2013 11:16:58 +0000 ecl (12.12.1-3) unstable; urgency=low * Upload to unstable -- Christoph Egger Sun, 30 Jun 2013 15:15:43 +0200 ecl (12.12.1-2) experimental; urgency=low * Disable gengc which conflicts with threading. Should fix some of the build failures we're seeing -- Christoph Egger Fri, 14 Dec 2012 14:35:47 -0800 ecl (12.12.1-1) experimental; urgency=low * New upstream releasse -- Christoph Egger Fri, 07 Dec 2012 15:19:14 -0800 ecl (12.2.1-1) experimental; urgency=low * New upstream release * Import patch to build on the hurd (Closes: #648993) -- Christoph Egger Sat, 14 Apr 2012 13:13:12 +0200 ecl (11.1.1+dfsg1-1ubuntu3) saucy; urgency=low * Rebuild to pick up new libgc package name -- Matthias Klose Wed, 03 Jul 2013 12:03:57 +0000 ecl (11.1.1+dfsg1-1ubuntu2) raring; urgency=low * Rebuild to pick up the new libgc1c3 dependency. -- Matthias Klose Wed, 27 Feb 2013 13:40:21 +0000 ecl (11.1.1+dfsg1-1ubuntu1) raring; urgency=low * Merge from Debian unstable. Remaining changes: - debian/rules: Really enable unicode support. -- Angel Abad Thu, 17 Jan 2013 11:40:10 +0100 ecl (11.1.1+dfsg1-1) unstable; urgency=low * Remove GFDL documentation (Closes: #695718) -- Christoph Egger Wed, 12 Dec 2012 16:25:48 -0800 ecl (11.1.1-4ubuntu1) precise; urgency=low * Merge from debian unstable (LP: #889463). Remaining changes: - debian/rules: Really enable unicode support. -- Leo Iannacone Sat, 12 Nov 2011 14:09:56 +0100 ecl (11.1.1-4) unstable; urgency=low * disable gengc on ia64 again -- Christoph Egger Fri, 11 Mar 2011 20:01:14 +0100 ecl (11.1.1-3) unstable; urgency=low * build against libgmp-dev instead of libgmp3-dev -- Christoph Egger Fri, 11 Mar 2011 18:34:26 +0100 ecl (11.1.1-2) unstable; urgency=low * New upstream. * Move to use quilt * Removed Luca from uploaders * Updated Standards-Version no real changes * Use system boehm libgc again * Fixed format of NEWS file * We forgot to remove the postrm, causing /usr/bin/ecl to get deleted on upgrades. Fixed this. -- Peter Van Eynde Tue, 08 Mar 2011 08:08:56 +0100 ecl (11.1.1-1) experimental; urgency=low [ Luca Capello ] * debian/control: + remove myself from Uploaders:. [ Christoph Egger ] * New upstream release * build against system libatomic-ops * Temporarily disable doc build (fails) * Remove dh-lisp / clc -- it's expected to disappear -- Christoph Egger Fri, 04 Mar 2011 00:04:30 +0100 ecl (10.3.1-3) experimental; urgency=low * Version for experimental * Build against system libgc again (Closes: #554081) -- Christoph Egger Sun, 18 Jul 2010 12:46:53 +0200 ecl (10.3.1-2ubuntu3) natty; urgency=low * No-change rebuild for the 686 transition. (LP: #710138) -- Krzysztof Klimonda Wed, 02 Mar 2011 17:44:49 +0100 ecl (10.3.1-2ubuntu2) maverick; urgency=low * debian/rules: Really enable unicode support. * src/gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/arm.h: - Fix FTBFS on ARM by including Ubuntu patch to libatomic-ops to the bundled version. The fact that the lib has to be shipped at all is already reported as Debian bug #554081. Patch done in-line as Debian does so. -- Andrew Starr-Bochicchio Thu, 13 May 2010 21:13:13 -0400 ecl (10.3.1-2ubuntu1) maverick; urgency=low * Merge from debian unstable, remaining changes: - debian/rules: Enable unicode support. -- Andrew Starr-Bochicchio Mon, 10 May 2010 19:10:47 -0400 ecl (10.3.1-2) unstable; urgency=low * Add a build-depends for install-info (Closes: #574701) -- Peter Van Eynde Wed, 31 Mar 2010 09:14:46 +0200 ecl (10.3.1-1) unstable; urgency=low * New upstream. * Force INSTALL_INFO to ginstall. (Closes: #562433, 573659) -- Peter Van Eynde Tue, 16 Mar 2010 21:50:19 +0100 ecl (9.12.3-1) unstable; urgency=low * New upstream. * Changed copyright link to LGPL-2 * fix spelling typo in src/clx/image.lisp * fix spelling typo in contrib/sockets/sockets.lisp * fix spelling typo in src/clos/streams.lsp -- Peter Van Eynde Thu, 31 Dec 2009 09:56:10 +0100 ecl (9.10.2-1) unstable; urgency=low * New upstream release. * use buildin boehm gc for now -- Peter Van Eynde Mon, 12 Oct 2009 11:47:27 +0100 ecl (9.8.4-2) unstable; urgency=low * I should not have changed to lisp section * Force the configure script to use ginstall-info, (Closes: #545625) -- Peter Van Eynde Thu, 24 Sep 2009 11:10:07 +0200 ecl (9.8.4-1) unstable; urgency=low * New upstream with major changes. * enable threading again * Changed to the lisp Section * Updated Standards-Version no real changes * Added linitian override for the clc directory * Added debian/README.building file -- Peter Van Eynde Wed, 02 Sep 2009 09:10:09 +0100 ecl (9.6.1-1ubuntu1) karmic; urgency=low * Merge from debian unstable, remaining changes: - debian/rules: Enable unicode support. -- Andrew Starr-Bochicchio Fri, 19 Jun 2009 15:32:01 -0400 ecl (9.6.1-1) unstable; urgency=low * New upstream release. * Fixed watch file * fixed clean to remove src/gc/configure.in file -- Peter Van Eynde Wed, 17 Jun 2009 22:42:16 +0200 ecl (9.4.1-1) unstable; urgency=low * New upstream with major changes. * now using debhelper version 7 * updated standard version without any real changes * use dh_prep instead of dh_clean -k * use redirected sf.net url for watch file * added ${misc:Depends} for ecl-doc * remove redundant Section field for binary package * remove empty usr/lib/ecl/h directory * fixed gnu typo in control file * fixed watch file to see new version numbering scheme -- Peter Van Eynde Wed, 29 Apr 2009 05:58:47 +0200 ecl (0.9j-20080306-5ubuntu1) intrepid; urgency=low * Merge from Debian unstable, remaining Ubuntu changes: - debian/rules: enable unicode support. -- Luca Falavigna Sun, 19 Oct 2008 12:51:22 +0200 ecl (0.9j-20080306-5) unstable; urgency=low * debian/control: + Build-Depends: on chrpath to remove unnecessary rpath headers from binaries in /usr/lib/ecl/, thanks to Bill Allombert (Closes: #495756). + Depends: on gcc, it's required at installation and everytime you want to produce a loadable object file. * debian/rules: + add chrpath call to 'install' target. -- Luca Capello Tue, 09 Sep 2008 21:54:43 +0200 ecl (0.9j-20080306-4ubuntu1) intrepid; urgency=low * Merge from debian unstable, remaining changes: + Enabled unicode support. (Closes: LP #123530) + debian/control: - Modify Maintainer value to match the DebianMaintainerField specification. - Updated Standards Version. -- Emanuele Gentili Sun, 13 Jul 2008 17:44:17 +0200 ecl (0.9j-20080306-4) unstable; urgency=low * debian/control: + build-depend on quilt to manage patches. * debian/patches/series: new file. * debian/patches/01_src-configure-add-missing-test.patch: + add missing `test' invocation in x86_64 check for dynamic FFI. * debian/rules: + adapt to quilt. -- Luca Capello Mon, 07 Jul 2008 18:49:53 +0200 ecl (0.9j-20080306-3) unstable; urgency=low * debian/rules: + fix FTBFS: move ls call from binary-arch to binary-indep, thanks to Bastian Blank (Closes: #488811). -- Luca Capello Mon, 07 Jul 2008 00:18:07 +0200 ecl (0.9j-20080306-2ubuntu1) intrepid; urgency=low * Enabled unicode support. (Closes: LP #123530) * Modify Maintainer value to match the DebianMaintainerField specification. -- Albin Tonnerre Fri, 20 Jun 2008 18:00:19 +0200 ecl (0.9j-20080306-2) unstable; urgency=low * debian/control: + add myself to Uploaders:. + add Vcs-Browser field. + remove trailing spaces from the long Description:. + conflict with common-lisp-controller << 6.15 because of #477169. + correct Info/HTML capitalizations in ecl-doc long Description:. - remove xutils from Build-Depends:. - remove traling empty lines. * debian/ecl-doc.doc-base: + new section 'Programming' (thanks to lintian). * debian/rules: + fix FTBFS: instead of simply reverting swap of binary-indep and binary-arch targets, create the arch-dependent "ecl" package in binary-arch and the arch-independent "ecl-doc" in binary-indep, thanks to Sebastian Bober for the patch (Closes: #471223). + remove trailing spaces. + correct lintian warning debian-rules-ignores-make-clean-error. -- Luca Capello Sun, 15 Jun 2008 19:30:07 +0200 ecl (0.9j-20080306-1) unstable; urgency=low * New upstream version. * updated standard version no real changes * added Homepage * Use default gcc (Closes: #463291) * Changed to group maintanance * Corrected Vcs-Git control field * swap binary-indep and binary-arch round -- Peter Van Eynde Fri, 07 Mar 2008 22:13:58 +0100 ecl (0.9i-20070908-1) unstable; urgency=low * added Svc line to control file * New upstream. -- Peter Van Eynde Thu, 27 Sep 2007 06:08:29 +0200 ecl (0.9i-20070324-2ubuntu1) gutsy; urgency=low * Enabled unicode support. (Closes: LP #123530) -- Chuck Short Sun, 08 Jul 2007 08:37:11 -0400 ecl (0.9i-20070324-2) unstable; urgency=low * Upload to unstable. -- Peter Van Eynde Mon, 09 Apr 2007 11:51:51 +0200 ecl (0.9i-20070324-1) experimental; urgency=low * New upstream version, adds support for Hurd. (Closes: #410374, #410368, #410367) -- Peter Van Eynde Tue, 27 Mar 2007 09:35:49 +0200 ecl (0.9i-20070214-1) experimental; urgency=low * new upstream, added GC_total_bytes fix. * updated standard version, no real changes * Fix for the strange FTBFS when unpacked in a path with a space (Closes: #410009) -- Peter Van Eynde Tue, 27 Feb 2007 11:59:49 +0100 ecl (0.9i-2) unstable; urgency=low * added GNU/kFreeBSD support (Closes: #377042) * Use system boehm gc. -- Peter Van Eynde Mon, 24 Jul 2006 19:35:12 +0200 ecl (0.9i-1) unstable; urgency=low * New upstream release. -- Peter Van Eynde Sun, 2 Jul 2006 00:20:00 +0200 ecl (0.9h-20060617-1) unstable; urgency=low * New upstream version * Updated standards version without real changes. -- Peter Van Eynde Wed, 21 Jun 2006 09:21:21 +0200 ecl (0.9h-20060510-1) unstable; urgency=low * New upstream release. * Did some rpath magic. Should: (Closes: #367415) * Updated doc-base file to include Index * Added removal of ecl and .o files on upgrade -- Peter Van Eynde Wed, 17 May 2006 02:46:26 +0200 ecl (0.9h-20060322-1) unstable; urgency=low * New upstream * Added build libraries and tools also for main package, as it needs gcc and libraries to build a new pacakge. (Closes: #360572) * Build with gcc-4.1 (Closes: #362088) -- Peter Van Eynde Thu, 13 Apr 2006 09:16:16 +0200 ecl (0.9h-20060216-2) unstable; urgency=low [René van Bevern] * debian/control: + Build-Depends: add dh-lisp 0.6 + Depends: remove common-lisp-controller (>= 5.11), it is automatically added + Provides: remove ${ecl:fasl-version} as it is defined nowhere [Peter Van Eynde] * Expanded copyright file to properly differentate files. -- Peter Van Eynde Sun, 26 Mar 2006 22:49:02 +0200 ecl (0.9h-20060216-1) unstable; urgency=low * Initial release. (Closes: #261350) -- Peter Van Eynde Wed, 11 Jan 2006 15:13:59 +0100 debian/updated-with-git-cvsimport0000664000000000000000000000013412314253135014314 0ustar git-cvsimport -o upstream -d :pserver:anonymous@common-lisp.net:/project/ecl/cvsroot -v ecl debian/install-clc.lisp0000664000000000000000000000151512314253135012267 0ustar ;;; -*- Mode: LISP; Package: CL-USER -*- ;;; ;;; Copyright (C) Peter Van Eynde 2001-2005 and Kevin Rosenberg 2002-2003 ;;; ;;; License: LGPL v2 ;;; (in-package "COMMON-LISP-USER") (require :cmp) (format t "~%Saving to new-ecl...") (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp" :verbose nil :print nil) (let ((files (common-lisp-controller:compile-common-lisp-controller-v5 "ecl"))) (format t "~%~%compile done, files: ~S~%" files) (system:gc t) (c:build-program "/usr/bin/ecl" :lisp-files files :epilogue-code '(progn (funcall (intern (symbol-name :init-common-lisp-controller-v5) (find-package :common-lisp-controller)) "ecl") (when (probe-file #p"/etc/lisp.config") (load #p"/etc/lisp.config")) (system:top-level)))) (quit) debian/compat0000664000000000000000000000000212314253135010365 0ustar 7 debian/README.source0000664000000000000000000000124612314253135011351 0ustar To build this package you need to get the git repository: git clone http://git.debian.org/git/pkg-common-lisp/ecl.git Upstream gets imported directly from the tar.gz file into the upstream branch. To update the package from upstream do: git checkout upstream rm -rf * tar zxvf ecl-.tar.gz mv ecl-/* . rmdir ecl- git status check if this is sane git add --all git tag upstream/ git checkout master git pull . upstream To build: git-buildpackage -uc -us 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. debian/libecl.dirs0000664000000000000000000000001412314253135011277 0ustar usr/lib/ecl debian/copyright0000664000000000000000000000535212314253135011127 0ustar This package was debianized by Peter Van Eynde on Mon, 12 Dec 2005 21:54:01 +0100. It was downloaded from http://sourceforge.net/projects/ecls Upstream Author: Juan Jose Garcia Ripoll ecls-list@lists.sourceforge.net Copyright: Copyright (c) 2000, Juan Jose Garcia Ripoll Copyright (c) 1990, 1991, 1993 Giuseppe Attardi Copyright (c) 1984 Taiichi Yuasa and Masami Hagiya All Rights Reserved Distributed under the terms of the GNU Library General Public Licence. See /usr/share/common-licenses/LGPL-2 Some files are not under the LGPL: - src/lsp/loop2.lsp - src/clx - contrib/asdf - contrib/rt: MIT-like licenses - src/lsp/pprint.lsp - src/lsp/format.lsp - contrib/sockets: in the public domain - contrib/defsystem: a special case, mostly MIT-like: ;;; MK:DEFSYSTEM 3.6 Interim ;;; ;;; Copyright (c) 1989 - 1999 Mark Kantrowitz. All rights reserved. ;;; 1999 - 2005 Mark Kantrowitz and Marco Antoniotti. All ;;; rights reserved. ;;; Use, copying, modification, merging, publishing, distribution ;;; and/or sale of this software, source and/or binary files and ;;; associated documentation files (the "Software") and of derivative ;;; works based upon this Software are permitted, as long as the ;;; following conditions are met: ;;; o this copyright notice is included intact and is prominently ;;; visible in the Software ;;; o if modifications have been made to the source code of the ;;; this package that have not been adopted for inclusion in the ;;; official version of the Software as maintained by the Copyright ;;; holders, then the modified package MUST CLEARLY identify that ;;; such package is a non-standard and non-official version of ;;; the Software. Furthermore, it is strongly encouraged that any ;;; modifications made to the Software be sent via e-mail to the ;;; MK-DEFSYSTEM maintainers for consideration of inclusion in the ;;; official MK-DEFSYSTEM package. ;;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ;;; EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ;;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. ;;; IN NO EVENT SHALL M. KANTROWITZ AND M. ANTONIOTTI BE LIABLE FOR ANY ;;; CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, ;;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ;;; Except as contained in this notice, the names of M. Kantrowitz and ;;; M. Antoniotti shall not be used in advertising or otherwise to promote ;;; the sale, use or other dealings in this Software without prior written ;;; authorization from M. Kantrowitz and M. Antoniotti. debian/source/0000775000000000000000000000000012314253136010470 5ustar debian/source/format0000664000000000000000000000001412314253135011675 0ustar 3.0 (quilt) debian/ecl-doc.info0000664000000000000000000000005112314253135011346 0ustar build/doc/ecl.info build/doc/ecldev.info debian/README.Debian0000664000000000000000000000047612314253135011237 0ustar The libecl.so file is changing too quickly and is integrated with the ecl binary to such extend that, after consultation with upstream, I will not create a libecl package. If ecl will reach a stable release (1.0 or so) and some guarantees with respect to API stability can be make I will reconsider this decision. debian/ecl.sh0000664000000000000000000000120412314253135010263 0ustar #!/bin/sh if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then cat <.tar.gz mv ecl-/* . rmdir ecl- git status check if this is sane git add --all git tag upstream/ git checkout master git pull . upstream To build: git-buildpackage -uc -us 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. debian/disabled.ecl-doc.doc-base0000664000000000000000000000046712314253135013651 0ustar Document: ecl-doc Title: ECL documentation Author: Juan Jose Garcia Ripoll, Giuseppe Attardi, Taiichi Yuasa and Masami Hagiya Abstract: This manual describes the usage of ECL Section: Programming Format: info Index: /usr/share/info/ecl.info.gz Files: /usr/share/info/ecl.info.gz /usr/share/info/ecldev.info.gz debian/clean0000664000000000000000000000001612314253135010171 0ustar config.status debian/ecl-doc.dirs0000664000000000000000000000001712314253135011356 0ustar usr/share/info debian/control0000664000000000000000000000366312314253135010602 0ustar Source: ecl Section: devel Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Common Lisp Team Uploaders: Peter Van Eynde , Christoph Egger Build-Depends: debhelper (>> 7.0.0), autotools-dev, libgmp-dev, file, texinfo, libncurses5-dev, fakeroot, libgc-dev (>= 1:7.1), chrpath, install-info, libatomic-ops-dev, libffi-dev Build-Conflicts: autoconf2.13, automake1.4 Standards-Version: 3.9.1 Homepage: http://ecls.sourceforge.net/ Vcs-Git: http://git.debian.org/git/pkg-common-lisp/ecl.git Vcs-Browser: http://git.debian.org/?p=pkg-common-lisp/ecl.git;a=summary Package: ecl Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libgmp3-dev, libncurses5-dev, libgc-dev, gcc Conflicts: common-lisp-controller (<< 6.15) Provides: lisp-compiler Suggests: slime, ecl-doc Description: Embeddable Common-Lisp: has an interpreter and can compile to C ECL stands for Embeddable Common-Lisp. The ECL project is an effort to modernize Giuseppe Attardi's ECL environment to produce an implementation of the Common-Lisp language which complies to the ANSI X3J13 definition of the language. . The current ECL implementation features: * A bytecodes compiler and interpreter. * A translator to C. * A UFFI-compatible interface to C code. * A dynamic loader. * The possibility to build standalone executables and DLLs. * The Common-Lisp Object System (CLOS). * Conditions and restarts for handling errors. * Sockets as ordinary streams. * The GNU Multiprecision library for fast bignum operations. * A simple conservative mark & sweep garbage collector. * The Boehm-Weiser garbage collector. Package: ecl-doc Section: doc Architecture: all Depends: ${misc:Depends} Suggests: ecl Description: documentation for Embeddable Common-Lisp Contains the Info and HTML documentation. debian/postrm0000664000000000000000000000167612314253135010450 0ustar #! /bin/sh # postrm script for series # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * `remove' # * `purge' # * `upgrade' # * `failed-upgrade' # * `abort-install' # * `abort-install' # * `abort-upgrade' # * `disappear' overwrit>r> # for details, see /usr/share/doc/packaging-manual/ case "$1" in purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) rm /usr/bin/ecl 2> /dev/null || true rm /usr/lib/ecl/*.o 2> /dev/null || true ;; *) echo "postrm called with unknown argument \`$1'" >&2 exit 0 esac # dh_installdeb will replace this with shell code automatically # generated by other debhelper scripts. #DEBHELPER# debian/dirs0000664000000000000000000000010312314253135010045 0ustar usr/bin usr/lib/ecl usr/share/man/man1 usr/share/lintian/overrides debian/patches/0000775000000000000000000000000012314253136010617 5ustar debian/patches/patch-typo-alloc_2.patch0000664000000000000000000000133312314253135015240 0ustar Description: correct small typo Author: Peter Van Eynde Forwarded: TBD Index: ecl/src/c/alloc_2.d =================================================================== --- ecl.orig/src/c/alloc_2.d 2012-02-05 09:44:41.000000000 +0100 +++ ecl/src/c/alloc_2.d 2012-04-14 13:13:53.886759521 +0200 @@ -191,7 +191,7 @@ FEerror("ecl_object_byte_size invoked with an immediate type ~D", 1, MAKE_FIXNUM(1)); if (t >= t_end) - FEerror("ecl_object_byte_size invoked with an unkown type ~D", + FEerror("ecl_object_byte_size invoked with an unknown type ~D", 1, MAKE_FIXNUM(1)); return type_info[t].size; } debian/patches/patch-typo-contrib-sockets-sockets.patch0000664000000000000000000000114012314253135020503 0ustar Description: correct small typo Author: Peter Van Eynde Forwarded: http://thread.gmane.org/gmane.lisp.ecl.general/8249 diff --git a/contrib/sockets/sockets.lisp b/contrib/sockets/sockets.lisp index 97f1364..a10a6c9 100755 --- a/contrib/sockets/sockets.lisp +++ b/contrib/sockets/sockets.lisp @@ -289,7 +289,7 @@ protocol. Other values are used as-is.") (stream) #+:wsock (non-blocking-p :initform nil)) - (:documentation "Common base class of all sockets, not ment to be + (:documentation "Common base class of all sockets, not meant to be directly instantiated.")) debian/patches/harden-configure.patch0000664000000000000000000000103412314253135015055 0ustar Description: Make configure work even when the current directory contains spaces Author: Christoph Egger Forwarded: NA --- ecl.orig/configure +++ ecl/configure @@ -10,7 +10,7 @@ #else # srcdir=`pwd`/src #fi -srcdir=`pwd`/src +srcdir="`pwd`/src" [ "x$buildir" = "x" ] && buildir=build export buildir @@ -34,6 +34,6 @@ fi cd ${buildir} -${srcdir}/configure --srcdir=${srcdir} "$@" +"${srcdir}/configure" --srcdir="${srcdir}" $* echo Configuration complete. To build ECL, issue 'make' in this directory. debian/patches/add_cas_emulation_for_armel.patch0000664000000000000000000000053212314253135017320 0ustar diff --git a/src/h/internal.h b/src/h/internal.h index 50fb8a9..595d0a2 100755 --- a/src/h/internal.h +++ b/src/h/internal.h @@ -422,6 +422,7 @@ extern void cl_write_object(cl_object x, cl_object stream); #endif /* ECL_THREADS */ #ifdef ECL_THREADS +# define AO_REQUIRE_CAS # ifdef ECL_LIBATOMIC_OPS_H # include # else debian/patches/patch-typo-src-clos-streams.patch0000664000000000000000000000122312314253135017124 0ustar Description: correct small typo Author: Peter Van Eynde Forwarded: http://thread.gmane.org/gmane.lisp.ecl.general/8249 diff --git a/src/clos/streams.lsp b/src/clos/streams.lsp index 389a9c6..321ee3d 100644 --- a/src/clos/streams.lsp +++ b/src/clos/streams.lsp @@ -69,7 +69,7 @@ (defgeneric stream-fresh-line (stream) (:documentation "Outputs a new line to the Stream if it is not positioned at the - begining of a line. Returns T if it output a new line, nil + beginning of a line. Returns T if it output a new line, nil otherwise. Used by FRESH-LINE. The default method uses STREAM-START-LINE-P and STREAM-TERPRI.")) debian/patches/autoconf-file-update.patch0000664000000000000000000006734512314253135015671 0ustar Description: Update the autoconf files Author: none copied from debian sources Forwarded: NA --- ecl.orig/src/gc/config.guess +++ ecl/src/gc/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Free Software Foundation, Inc. -timestamp='2006-06-06' +timestamp='2009-12-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,16 +27,16 @@ # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a ChangeLog +# entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,8 +56,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -161,6 +162,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -169,7 +171,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -211,7 +213,7 @@ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -323,14 +325,33 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -531,7 +552,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -639,7 +660,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -780,7 +801,7 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -790,15 +811,24 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[345]*) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T:Interix*:[345]*) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -828,8 +858,29 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -843,6 +894,17 @@ frv:Linux:*:*) echo frv-unknown-linux-gnu exit ;; + i*86:Linux:*:*) + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; @@ -852,74 +914,33 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips64 - #undef mips64el + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) echo or32-unknown-linux-gnu exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + padre:Linux:*:*) + echo sparc-unknown-linux-gnu exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level @@ -929,8 +950,11 @@ *) echo hppa-unknown-linux-gnu ;; esac exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux @@ -950,69 +974,9 @@ x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both @@ -1041,7 +1005,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1085,8 +1049,11 @@ pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1124,6 +1091,16 @@ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1136,7 +1113,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) @@ -1199,6 +1176,9 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1208,6 +1188,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1217,6 +1206,16 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1298,6 +1297,9 @@ i*86:rdos:*:*) echo ${UNAME_MACHINE}-pc-rdos exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1458,9 +1460,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- ecl.orig/src/gc/config.sub +++ ecl/src/gc/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 +# Free Software Foundation, Inc. -timestamp='2006-06-06' +timestamp='2010-01-22' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -32,13 +32,16 @@ # Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -72,8 +75,9 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free +Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -122,6 +126,7 @@ case $maybe_os in nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` @@ -148,10 +153,13 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) + -apple | -axis | -knuth | -cray | -microblaze) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -245,17 +253,20 @@ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ @@ -268,6 +279,7 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ | mt \ | msp430 \ | nios | nios2 \ @@ -276,19 +288,22 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ + | ubicom32 \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) + m6811 | m68hc11 | m6812 | m68hc12 | picochip) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none @@ -323,19 +338,22 @@ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ @@ -356,21 +374,27 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile-* | tilegx-* \ | tron-* \ + | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -434,6 +458,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -442,10 +470,26 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -474,8 +518,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -513,6 +557,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -667,6 +715,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -678,10 +734,17 @@ basic_machine=ns32k-utek os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -808,6 +871,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -909,6 +980,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -920,6 +995,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -1009,6 +1087,15 @@ basic_machine=tic6x-unknown os=-coff ;; + # This must be matched before tile*. + tilegx*) + basic_machine=tilegx-unknown + os=-linux-gnu + ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1084,6 +1171,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1122,7 +1213,7 @@ we32k) basic_machine=we32k-att ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) @@ -1172,6 +1263,9 @@ # First match some system type aliases # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1192,10 +1286,11 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ @@ -1204,7 +1299,7 @@ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1214,7 +1309,7 @@ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1344,6 +1439,11 @@ -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; -none) ;; *) @@ -1366,6 +1466,9 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; spu-*) os=-elf ;; @@ -1406,6 +1509,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1535,7 +1641,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) debian/patches/series0000664000000000000000000000011212314253135012025 0ustar harden-configure.patch patch-hurd.patch add_cas_emulation_for_armel.patch debian/patches/build-with-libatomic-ops.patch0000664000000000000000000000245612314253135016456 0ustar Description: Change the build to use the systems libatomic Author: Christoph Egger Forwarded: NA Index: ecl/src/configure =================================================================== --- ecl.orig/src/configure 2012-02-05 09:44:43.000000000 +0100 +++ ecl/src/configure 2012-04-14 13:13:48.426732831 +0200 @@ -14329,11 +14329,11 @@ --libdir=${destdir} --build=${build_alias} --host=${host_alias} \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CPPFLAGS="$CPPFLAGS" CC="${CC} \ ${PICFLAG}") - SUBDIRS="${SUBDIRS} atomic" - CORE_LIBS="-leclatomic ${CORE_LIBS}" - if test "${enable_shared}" = "no"; then - LIBRARIES="${LIBRARIES} ${LIBPREFIX}eclatomic.${LIBEXT}" - fi +# SUBDIRS="${SUBDIRS} atomic" + CORE_LIBS="-latomic_ops ${CORE_LIBS}" +# if test "${enable_shared}" = "no"; then +# LIBRARIES="${LIBRARIES} ${LIBPREFIX}eclatomic.${LIBEXT}" +# fi fi Index: ecl/src/h/internal.h =================================================================== --- ecl.orig/src/h/internal.h 2012-02-05 09:44:47.000000000 +0100 +++ ecl/src/h/internal.h 2012-04-14 13:13:48.426732831 +0200 @@ -402,7 +402,7 @@ #endif /* ECL_THREADS */ #ifdef ECL_THREADS -# include +# include #else # define AO_load(x) (x) # define AO_store(x,y) ((x)=(y)) debian/patches/patch-hurd.patch0000664000000000000000000000071312314253135013677 0ustar Index: ecl/src/c/unixint.d =================================================================== --- ecl.orig/src/c/unixint.d 2012-12-07 15:18:57.055829624 -0800 +++ ecl/src/c/unixint.d 2012-12-07 15:22:19.335829155 -0800 @@ -1386,6 +1386,8 @@ */ #ifdef SIGRTMIN # define DEFAULT_THREAD_INTERRUPT_SIGNAL SIGRTMIN + 2 +#elif defined(__GNU__) +# define DEFAULT_THREAD_INTERRUPT_SIGNAL SIGINFO #else # define DEFAULT_THREAD_INTERRUPT_SIGNAL SIGUSR1 #endif debian/patches/patch-typo-src-clx-image.patch0000664000000000000000000000167412314253135016370 0ustar Description: correct small typo Author: Peter Van Eynde Forwarded: http://thread.gmane.org/gmane.lisp.ecl.general/8249 --- ecl.orig/src/clx/image.lisp +++ ecl/src/clx/image.lisp @@ -1308,7 +1308,7 @@ (image-xy (eq format :xy-pixmap)) (image-z (eq format :z-pixmap)) (image-x t)) - (error "Result-type ~s is incompatable with format ~s" + (error "Result-type ~s is incompatible with format ~s" result-type format)) (unless plane-mask (setq plane-mask #xffffffff)) (let ((display (drawable-display drawable))) @@ -2647,7 +2647,7 @@ (unless (= depth image-depth) (if (= image-depth 1) (unless gcontext (xlib::required-arg gcontext)) - (error "Pixmap depth ~d incompatable with image depth ~d" + (error "Pixmap depth ~d incompatible with image depth ~d" depth image-depth))) (put-image pixmap gc image :x 0 :y 0 :bitmap-p (and (= image-depth 1) gcontext))