From 7079309309ff13315e41e20261d466a98f9314bb Mon Sep 17 00:00:00 2001 Message-Id: <7079309309ff13315e41e20261d466a98f9314bb.1715346967.git.mdw@distorted.org.uk> From: Mark Wooding Date: Mon, 2 Jan 2012 17:47:42 +0000 Subject: [PATCH] Fix breakage loading up clg-tools. Organization: Straylight/Edgeware From: Rupert Swarbrick New ASDFs seem to have a featurep symbol which we were clashing with. Shadow the import from pkg-config. --- tools/asdf-extensions.lisp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/asdf-extensions.lisp b/tools/asdf-extensions.lisp index 016ff46..a6dd160 100644 --- a/tools/asdf-extensions.lisp +++ b/tools/asdf-extensions.lisp @@ -1,6 +1,9 @@ (in-package :asdf) (eval-when (:load-toplevel :compile-toplevel :execute) + ;; ASDF defines featurep, which we don't want to clobber. As such, shadow it + ;; here and then reference it with a pkg-config: prefix below. + (shadow :featurep) (use-package :pkg-config)) (export '(*search-library-path-on-reload* *dso-extension* @@ -60,7 +63,7 @@ (defun load-shared-object (pathname &optional dont-save-p (reload-p dont-save-p) (pushnew (namestring-name namestring) *reload-shared-objects* :test #'string=))))) -#?(or (sbcl< 1 0 22) (featurep :cmu)) +#?(or (sbcl< 1 0 22) (pkg-config:featurep :cmu)) (progn (defun remove-shared-objects () (dolist (namestring *dont-save-shared-objects*) -- [mdw]