This is an automated email from the ASF dual-hosted git repository.

ronny pushed a commit to branch dev/detect-multiarch
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 0914a106b860ee5d0ad3b8b30b23ee3aa577c9ab
Author: Ronny Berndt <[email protected]>
AuthorDate: Thu Aug 21 21:01:21 2025 +0200

    dev: support multiarch names (Debian based systems)
---
 configure | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure b/configure
index 9d82e3734..f2b23824a 100755
--- a/configure
+++ b/configure
@@ -46,6 +46,7 @@ 
CLOUSEAU_URI=${CLOUSEAU_URI:-"https://github.com/cloudant-labs/clouseau/releases
 CLOUSEAU_VSN=${CLOUSEAU_VSN:-"2.25.0"}
 CLOUSEAU_DIR="$(pwd)"/clouseau
 ARCH="$(uname -m)"
+MULTIARCHNAME="$(dpkg-architecture -q DEB_HOST_MULTIARCH)"
 ERLANG_VER="$(run_erlang 'io:put_chars(erlang:system_info(otp_release)).')"
 ERLANG_OS="$(run_erlang 'case os:type() of {OS, _} -> io:format("~s~n", [OS]) 
end.')"
 
@@ -327,6 +328,7 @@ if [ "${WITH_SPIDERMONKEY}" = "true" ] && [ "${ERLANG_OS}" 
= "unix" ]; then
 
     # This list is taken from src/couch/rebar.config.script, please keep them 
in sync.
     if [ ! -d "/usr/include/${SM_HEADERS}" ] && \
+        [ ! -d "/usr/include/${MULTIARCHNAME}" ] && \
         [ ! -d "/usr/local/include/${SM_HEADERS}" ] && \
         [ ! -d "/opt/homebrew/include/${SM_HEADERS}" ]; then
         echo "ERROR: SpiderMonkey ${SM_VSN} is not found. Please specify with 
--spidermonkey-version."

Reply via email to