summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Jakob Nixdorf <flocke@shadowice.org> 2015-04-19 20:50:05 +0200
committerAvatar Jakob Nixdorf <flocke@shadowice.org> 2015-04-19 22:05:07 +0200
commit20f777ef90e4eb5d684b5f1302f931595459b0d6 (patch)
treef13c6acb079b8a2d9360352bb4187f22595b7510
parent41ed2d5b519c698ae78ccd66d851f5b15d2da31c (diff)
downloadlisp-20f777ef90e4eb5d684b5f1302f931595459b0d6.tar.gz
lisp-20f777ef90e4eb5d684b5f1302f931595459b0d6.tar.xz
dev-lang/sbcl: more multiarch fixes
-rw-r--r--packages/dev-lang/sbcl/sbcl-1.2.7-r2.exheres-0 (renamed from packages/dev-lang/sbcl/sbcl-1.2.7-r1.exheres-0)0
-rw-r--r--packages/dev-lang/sbcl/sbcl.exlib14
2 files changed, 7 insertions, 7 deletions
diff --git a/packages/dev-lang/sbcl/sbcl-1.2.7-r1.exheres-0 b/packages/dev-lang/sbcl/sbcl-1.2.7-r2.exheres-0
index 50bdb2c..50bdb2c 100644
--- a/packages/dev-lang/sbcl/sbcl-1.2.7-r1.exheres-0
+++ b/packages/dev-lang/sbcl/sbcl-1.2.7-r2.exheres-0
diff --git a/packages/dev-lang/sbcl/sbcl.exlib b/packages/dev-lang/sbcl/sbcl.exlib
index 4c5280b..354dd4f 100644
--- a/packages/dev-lang/sbcl/sbcl.exlib
+++ b/packages/dev-lang/sbcl/sbcl.exlib
@@ -42,9 +42,7 @@ src_prepare() {
# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
edo sed -e "\$s:\"\$:-exherbo.${PR#r}\":" -i version.lisp-expr
- edo sed -e s:lib:${LIBDIR}: -i install.sh
- edo sed -e "/^#define SBCL_HOME/s:lib:${LIBDIR}:" -i src/runtime/runtime.c
- edo sed -e s:/bin/ed:/usr/bin/ed: -i tests/run-program.impure.lisp
+ edo sed -e s:/bin/ed:/usr/$(exhost --target)/bin/ed: -i tests/run-program.impure.lisp
# use prefixed nm
edo sed -e "s/nm/$(exhost --tool-prefix)&/" -i src/runtime/linux-nm
@@ -64,7 +62,7 @@ src_compile() {
local sbcl_bin_dir="$(echo ${WORKBASE}/${PN}-*-linux)"
local sbcl_bin="${sbcl_bin_dir}/src/runtime/sbcl --core ${sbcl_bin_dir}/output/sbcl.core"
else
- local sbcl_bin=/usr/bin/sbcl
+ local sbcl_bin=/usr/$(exhost --target)/bin/sbcl
fi
local sbcl_args="--no-sysinit --no-userinit --disable-debugger"
@@ -91,19 +89,21 @@ src_install() {
edo env \
BUILD_ROOT="${IMAGE}" \
DOC_DIR=/usr/share/doc/${PNVR} \
- INSTALL_ROOT=/usr \
+ INFO_DIR=/usr/share/info \
+ MAN_DIR=/usr/share/man \
+ INSTALL_ROOT=/usr/$(exhost --target) \
sh install.sh
local sbcl_source_root=/usr/src/${PN}
dodir ${sbcl_source_root}
edo tar --strip-components=1 -xf source.tar -C "${IMAGE}"${sbcl_source_root}/
- edo find "${IMAGE}"/usr/${LIBDIR} -type d -empty -delete
+ edo find "${IMAGE}"/usr/$(exhost --target)/lib -type d -empty -delete
edo find "${IMAGE}"/usr/share -type d -empty -delete
# Necessary for running newly-saved images
hereenvd 50sbcl <<EOF
-SBCL_HOME=/usr/${LIBDIR}/${PN}
+SBCL_HOME=/usr/$(exhost --target)/lib/${PN}
SBCL_SOURCE_ROOT=${sbcl_source_root}
EOF