2.20.20: Fix upgrade using load-system on CMUCL,

by using unintern rather than fmakunbound for redefined generic functions.

diff --git a/Makefile b/Makefile
index 717d292..bf1639b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -112,8 +112,8 @@ test-upgrade:
            case ${lisp}:$$tag:$$x in \
              ecl:1.*|ecl:2.00*|ecl:2.01[0-6]:*|ecl:2.20:*) \
                : Skip, because of various ASDF issues ;; \
-             cmucl:*:load-system) \
-               : Skip, because of various ASDF issues ;; \
+             cmucl:1.*) \
+               : Skip, CMUCL cannot upgrade from ASDF 1. Happily, it ships ASDF 2 ;; \
              *) (set -x ; \
                   case $$x in \
                    load-system) $$lv "$$lo" $$ev "$$la" $$ev "$$te" ;; \

diff --git a/asdf.asd b/asdf.asd
index b9a261d..eba7dae 100644 (file)
--- a/asdf.asd
+++ b/asdf.asd
@@ -14,7 +14,7 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :long-description "ASDF builds Common Lisp software organized into defined systems."
-  :version "2.20.19" ;; to be automatically updated by bin/bump-revision
+  :version "2.20.20" ;; to be automatically updated by bin/bump-revision
   :depends-on ()
   :components
   ((:file "asdf")

diff --git a/asdf.lisp b/asdf.lisp
index a9b5503..e9d7d45 100644 (file)
--- a/asdf.lisp
+++ b/asdf.lisp
@@ -1,5 +1,5 @@
 ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*-
-;;; This is ASDF 2.20.19: Another System Definition Facility.
+;;; This is ASDF 2.20.20: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.
@@ -116,7 +116,7 @@
          ;; "2.345.6" would be a development version in the official upstream
          ;; "2.345.0.7" would be your seventh local modification of official release 2.345
          ;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
-         (asdf-version "2.20.19")
+         (asdf-version "2.20.20")
          (existing-asdf (find-class 'component nil))
          (existing-version *asdf-version*)
          (already-there (equal asdf-version existing-version)))
@@ -213,10 +213,10 @@
            (ensure-package (name &key nicknames use unintern
                                  shadow export redefined-functions)
              (let* ((p (ensure-exists name nicknames use)))
-               (ensure-unintern p unintern)
+               (ensure-unintern p (append unintern #+cmu redefined-functions))
                (ensure-shadow p shadow)
                (ensure-export p export)
-               (ensure-fmakunbound p redefined-functions)
+               #-cmu (ensure-fmakunbound p redefined-functions)
                p)))
         (macrolet
             ((pkgdcl (name &key nicknames use export