From 6d4cfba596891a5be75358beda232c3c2238c259 Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Thu, 16 Jun 2022 02:33:48 -0600 Subject: [PATCH] Ports/ruby: Pass proper --with-coroutine flag per architecture This fixes the x86_64 build. However, when built with clang x86_64, ruby crashes on exit trying to free some memory that has an invalid header magic. More work to be done here to make the x86_64 build work properly. --- Ports/ruby/package.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Ports/ruby/package.sh b/Ports/ruby/package.sh index 8662622ee26..58ee779743a 100755 --- a/Ports/ruby/package.sh +++ b/Ports/ruby/package.sh @@ -18,7 +18,21 @@ launcher_command="/usr/local/bin/ruby /usr/local/bin/irb --legacy" launcher_run_in_terminal="true" icon_file="../ruby-kit/ruby.png" -configopts=("--with-coroutine=x86" "--disable-install-doc") +configopts=( + "--disable-install-doc" +) + +case "${SERENITY_ARCH}" in + x86_64) + configopts+=("--with-coroutine=amd64") + ;; + i686) + configopts+=("--with-coroutine=x86") + ;; + *) + echo "Error: Architecture ${SERENITY_ARCH} is not supported for this port" + exit 1 +esac export CFLAGS="-DNGROUPS_MAX=65536"