这是indexloc提供的服务,不要输入任何密码
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions disabled-packages/sbcl/build.sh

This file was deleted.

15 changes: 0 additions & 15 deletions disabled-packages/sbcl/make-config.sh.patch

This file was deleted.

30 changes: 30 additions & 0 deletions packages/sbcl/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
TERMUX_PKG_HOMEPAGE=http://www.sbcl.org/
TERMUX_PKG_DESCRIPTION="SBCL (Steel Bank Common Lisp) is a high performance Common Lisp compiler."
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_MAINTAINER="@metayan"
TERMUX_PKG_VERSION=2.1.10
TERMUX_PKG_SRCURL=https://downloads.sourceforge.net/sbcl/sbcl-${TERMUX_PKG_VERSION}-source.tar.bz2
TERMUX_PKG_SHA256=eb183f0f59a5cb2cbed762ec062bc34b9b6214b65402660784ef54838884b138
TERMUX_PKG_DEPENDS="ecl"

termux_step_make() {
cd $TERMUX_PKG_SRCDIR

# Use SBCL if we have it already, otherwise ECL
if [ "`which sbcl`" ]; then
XC_HOST="`which sbcl` --no-sysinit --no-userinit"
else
XC_HOST="$TERMUX_PREFIX/bin/ecl --norc"
fi

./make.sh \
--xc-host="$XC_HOST" \
--fancy \
--without-gcc-tls \
--prefix=$TERMUX_PREFIX
}

termux_step_make_install() {
cd $TERMUX_PKG_SRCDIR
./install.sh
}
69 changes: 69 additions & 0 deletions packages/sbcl/termux-tweaks.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
diff --git a/contrib/sb-posix/posix-tests.lisp b/contrib/sb-posix/posix-tests.lisp
index 7c94a43..c565fad 100644
--- a/contrib/sb-posix/posix-tests.lisp
+++ b/contrib/sb-posix/posix-tests.lisp
@@ -527,7 +527,7 @@
3 #\f #\o #\o)

(deftest opendir.1
- (let ((dir (sb-posix:opendir "/")))
+ (let ((dir (sb-posix:opendir "@TERMUX_PREFIX@/tmp")))
(unwind-protect (sb-alien:null-alien dir)
(unless (sb-alien:null-alien dir)
(sb-posix:closedir dir))))
@@ -535,7 +535,7 @@

#-(and darwin x86)
(deftest readdir.1
- (let ((dir (sb-posix:opendir "/")))
+ (let ((dir (sb-posix:opendir "@TERMUX_PREFIX@/tmp")))
(unwind-protect
(block dir-loop
(loop for dirent = (sb-posix:readdir dir)
@@ -868,7 +868,7 @@

#-win32
(deftest mkstemp.null-terminate
- (let* ((default (make-pathname :directory '(:absolute "tmp")))
+ (let* ((default (make-pathname :directory (list :absolute (string-left-trim '(#\/) "@TERMUX_PREFIX@/tmp"))))
(filename (namestring (make-pathname :name "mkstemp-1"
:type "XXXXXX"
:defaults default)))
@@ -883,9 +883,9 @@
(make-string n :initial-element #\x))
:defaults default))
(unwind-protect
- (values (integerp fd) (subseq temp 0 (position #\. temp)))
+ (values (integerp fd) (subseq temp 0 (position #\. temp :from-end t)))
(delete-file temp))))
- t "/tmp/mkstemp-1")
+ t "@TERMUX_PREFIX@/tmp/mkstemp-1")

(deftest envstuff
(let ((name1 "ASLIFJLSDKFJKAHGSDKLJH")
diff --git a/src/runtime/run-program.c b/src/runtime/run-program.c
index 929ac99..f12d21b 100644
--- a/src/runtime/run-program.c
+++ b/src/runtime/run-program.c
@@ -100,7 +100,7 @@ void closefrom_fallback(int lowfd)
{
int fd, maxfd;

-#ifdef SVR4
+#if defined(SVR4) || defined(__ANDROID__)
maxfd = sysconf(_SC_OPEN_MAX)-1;
#else
maxfd = getdtablesize()-1;
diff --git a/tools-for-build/grovel-headers.c b/tools-for-build/grovel-headers.c
index 1fc1fa0..abbe071 100644
--- a/tools-for-build/grovel-headers.c
+++ b/tools-for-build/grovel-headers.c
@@ -40,7 +40,7 @@
#include <sys/times.h>
#include <sys/wait.h>
#include <sys/ioctl.h>
-#if defined __HAIKU__ || defined __DragonFly__ || defined LISP_FEATURE_ANDROID
+#if defined __HAIKU__ || defined __DragonFly__ || defined LISP_FEATURE_ANDROID || defined __ANDROID__
#include <termios.h>
#else
#include <sys/termios.h>