From af93c419db9603549bf4fed0d471e7efebd31a7c Mon Sep 17 00:00:00 2001
From: "termux-actions[bot]" <termux-actions[bot]@users.noreply.github.com>
Date: Sat, 25 Dec 2021 20:22:13 +0000
Subject: [PATCH] packages/gauche

---
 packages/gauche/build.sh                        | 17 ++++++++++++-----
 packages/gauche/src-gauche-priv-atomicP.h.patch | 11 +++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 packages/gauche/src-gauche-priv-atomicP.h.patch

diff --git a/packages/gauche/build.sh b/packages/gauche/build.sh
index 03aad0289b..5d7cb9df05 100644
--- a/packages/gauche/build.sh
+++ b/packages/gauche/build.sh
@@ -2,19 +2,24 @@ TERMUX_PKG_HOMEPAGE=https://practical-scheme.net/gauche/
 TERMUX_PKG_DESCRIPTION="An R7RS Scheme implementation developed to be a handy script interpreter"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=0.9.10
+TERMUX_PKG_VERSION=0.9.11
 TERMUX_PKG_SRCURL=https://github.com/shirok/Gauche/releases/download/release${TERMUX_PKG_VERSION//./_}/Gauche-${TERMUX_PKG_VERSION}.tgz
-TERMUX_PKG_SHA256=0f39df1daec56680b542211b085179cb22e8220405dae15d9d745c56a63a2532
+TERMUX_PKG_SHA256=395e4ffcea496c42a5b929a63f7687217157c76836a25ee4becfcd5f130f38e4
 TERMUX_PKG_DEPENDS="binutils, ca-certificates, gdbm, libcrypt, libiconv, mbedtls, zlib"
 TERMUX_PKG_HOSTBUILD=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="
 --with-ca-bundle=$TERMUX_PREFIX/etc/tls/cert.pem
 --with-libatomic-ops=no
 --with-slib=$TERMUX_PREFIX/share/slib
 "
-# 0.9.10 does not support MbedTLS 3.0: remove --with-tls=... when updating
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-tls=axtls"
 # As of 0.9.10 some code hangs with threads enabled, e.g.
 # ```
 # (use rfc.uri)
@@ -25,7 +30,9 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-threads=none"
 termux_step_host_build() {
 	_PREFIX_FOR_BUILD=$TERMUX_PKG_HOSTBUILD_DIR/prefix
 	mkdir -p $_PREFIX_FOR_BUILD
-	"$TERMUX_PKG_SRCDIR"/configure --prefix=$_PREFIX_FOR_BUILD
+
+	find "$TERMUX_PKG_SRCDIR" -mindepth 1 -maxdepth 1 ! -name build_gosh -exec cp -a \{\} ./ \;
+	./configure --prefix=$_PREFIX_FOR_BUILD
 	make -j $TERMUX_MAKE_PROCESSES
 	make install
 }
diff --git a/packages/gauche/src-gauche-priv-atomicP.h.patch b/packages/gauche/src-gauche-priv-atomicP.h.patch
new file mode 100644
index 0000000000..1794b9afb7
--- /dev/null
+++ b/packages/gauche/src-gauche-priv-atomicP.h.patch
@@ -0,0 +1,11 @@
+--- a/src/gauche/priv/atomicP.h
++++ b/src/gauche/priv/atomicP.h
+@@ -95,7 +95,7 @@
+  *
+  *      -- gniibe  2012-11-27
+  */
+-#if defined(__ARMEL__)
++#if defined(__ARMEL__) && !defined(__ARM_ARCH_7A__)
+ #define AO_USE_PTHREAD_DEFS 1
+ #endif
+