| 1 |
commit: 6a6a45b8333d9131985a21f75956c28d53902fd9 |
| 2 |
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 29 15:21:28 2017 +0000 |
| 4 |
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 29 15:21:28 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a6a45b8 |
| 7 |
|
| 8 |
common-lisp-3.eclass: Adds missing lisp package names and exports CL_BINARY variable |
| 9 |
|
| 10 |
eclass/common-lisp-3.eclass | 20 +++++++++++++------- |
| 11 |
1 file changed, 13 insertions(+), 7 deletions(-) |
| 12 |
|
| 13 |
diff --git a/eclass/common-lisp-3.eclass b/eclass/common-lisp-3.eclass |
| 14 |
index dce8ed5a876..f0f0b0dac83 100644 |
| 15 |
--- a/eclass/common-lisp-3.eclass |
| 16 |
+++ b/eclass/common-lisp-3.eclass |
| 17 |
@@ -41,7 +41,9 @@ EXPORT_FUNCTIONS src_compile src_install |
| 18 |
# @DESCRIPTION: |
| 19 |
# Since there's nothing to build in most cases, default doesn't do |
| 20 |
# anything. |
| 21 |
-common-lisp-3_src_compile() { true; } |
| 22 |
+common-lisp-3_src_compile() { |
| 23 |
+ true; |
| 24 |
+} |
| 25 |
|
| 26 |
# @FUNCTION: absolute-path-p |
| 27 |
# @DESCRIPTION: |
| 28 |
@@ -117,7 +119,7 @@ common-lisp-install-sources() { |
| 29 |
elif [[ -d ${path} ]] ; then |
| 30 |
common-lisp-install-sources -t ${ftype} $(find "${path}" -type f) |
| 31 |
else |
| 32 |
- die "${path} it neither a regular file nor a directory" |
| 33 |
+ die "${path} is neither a regular file nor a directory" |
| 34 |
fi |
| 35 |
done |
| 36 |
} |
| 37 |
@@ -168,6 +170,7 @@ common-lisp-3_src_install() { |
| 38 |
# @DESCRIPTION: |
| 39 |
# Export a few variables containing the switches necessary |
| 40 |
# to make the CL implementation perform basic functions: |
| 41 |
+# * CL_BINARY: Common Lisp implementation |
| 42 |
# * CL_NORC: don't load syste-wide or user-specific initfiles |
| 43 |
# * CL_LOAD: load a certain file |
| 44 |
# * CL_EVAL: eval a certain expression at startup |
| 45 |
@@ -176,13 +179,15 @@ common-lisp-export-impl-args() { |
| 46 |
eerror "Usage: ${FUNCNAME[0]} lisp-implementation" |
| 47 |
die "${FUNCNAME[0]}: wrong number of arguments: $#" |
| 48 |
fi |
| 49 |
- case ${1} in |
| 50 |
+ CL_BINARY="${1}" |
| 51 |
+ case "${CL_BINARY}" in |
| 52 |
clisp) |
| 53 |
CL_NORC="-norc" |
| 54 |
CL_LOAD="-i" |
| 55 |
CL_EVAL="-x" |
| 56 |
;; |
| 57 |
- clozure | ccl | openmcl) |
| 58 |
+ clozure | clozurecl | ccl | openmcl) |
| 59 |
+ CL_BINARY="ccl" |
| 60 |
CL_NORC="--no-init" |
| 61 |
CL_LOAD="--load" |
| 62 |
CL_EVAL="--eval" |
| 63 |
@@ -192,7 +197,8 @@ common-lisp-export-impl-args() { |
| 64 |
CL_LOAD="-load" |
| 65 |
CL_EVAL="-eval" |
| 66 |
;; |
| 67 |
- ecl) |
| 68 |
+ ecl | ecls) |
| 69 |
+ CL_BINARY="ecl" |
| 70 |
CL_NORC="-norc" |
| 71 |
CL_LOAD="-load" |
| 72 |
CL_EVAL="-eval" |
| 73 |
@@ -203,8 +209,8 @@ common-lisp-export-impl-args() { |
| 74 |
CL_EVAL="--eval" |
| 75 |
;; |
| 76 |
*) |
| 77 |
- die ${1} is not supported by ${0} |
| 78 |
+ die "${CL_BINARY} is not supported by ${0}" |
| 79 |
;; |
| 80 |
esac |
| 81 |
- export CL_NORC CL_LOAD CL_EVAL |
| 82 |
+ export CL_BINARY CL_NORC CL_LOAD CL_EVAL |
| 83 |
} |
Archives