sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gauche: Fix assertion failure on arm

Browse Source 
Effectively reverts commit 3aca178a07.
This commit is contained in:
Tee KOBAYASHI 2021-12-30 14:47:56 +09:00 committed by Leonid Pliushch
parent 794f8f791b
commit 3636e9fb9c
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/gauche/build.sh
View File

@ -3,18 +3,13 @@ TERMUX_PKG_DESCRIPTION="An R7RS Scheme implementation developed to be a handy sc
TERMUX_PKG_LICENSE="BSD 3-Clause" TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.9.11 TERMUX_PKG_VERSION=0.9.11
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/shirok/Gauche/releases/download/release${TERMUX_PKG_VERSION//./_}/Gauche-${TERMUX_PKG_VERSION}.tgz TERMUX_PKG_SRCURL=https://github.com/shirok/Gauche/releases/download/release${TERMUX_PKG_VERSION//./_}/Gauche-${TERMUX_PKG_VERSION}.tgz
TERMUX_PKG_SHA256=395e4ffcea496c42a5b929a63f7687217157c76836a25ee4becfcd5f130f38e4 TERMUX_PKG_SHA256=395e4ffcea496c42a5b929a63f7687217157c76836a25ee4becfcd5f130f38e4
TERMUX_PKG_DEPENDS="binutils, ca-certificates, gdbm, libcrypt, libiconv, mbedtls, zlib" TERMUX_PKG_DEPENDS="binutils, ca-certificates, gdbm, libcrypt, libiconv, mbedtls, zlib"
TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_HOSTBUILD=true
TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_BUILD_IN_SRC=true
# Does not work on arm:
# ```
# "/home/builder/.termux-build/gauche/src/src/list.c", line 798 (ScmExtendedPairDescriptor *Scm__GetExtendedPairDescriptor(ScmObj)): Assertion failed: (z->hiddenTag&0x7) == 0x7
# ```
TERMUX_PKG_BLACKLISTED_ARCHES="arm"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--with-ca-bundle=$TERMUX_PREFIX/etc/tls/cert.pem --with-ca-bundle=$TERMUX_PREFIX/etc/tls/cert.pem
--with-libatomic-ops=no --with-libatomic-ops=no

11
packages/gauche/src-gauche-priv-pairP.h.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/src/gauche/priv/pairP.h
+++ b/src/gauche/priv/pairP.h
@@ -65,7 +65,7 @@
* and immutable pairs, but that'll break existing code which tests equality
* of class, rather than is-a relationship.
*/
-typedef struct ScmExtendedPairDescriptorRec {
+typedef __attribute__((__aligned__(8))) struct ScmExtendedPairDescriptorRec {
ScmClass *klass;
u_long flags;
void (*setCar)(ScmObj, ScmObj);