ruby: Update from 2.4.2 to 2.4.3

[termux-packages] / packages / ruby / build.sh

diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh
index 07eb050..f85f979 100644 (file)
--- a/packages/ruby/build.sh
+++ b/packages/ruby/build.sh
@@ -1,11 +1,11 @@
 TERMUX_PKG_HOMEPAGE=https://www.ruby-lang.org/
 TERMUX_PKG_DESCRIPTION="Dynamic programming language with a focus on simplicity and productivity"
 _MAJOR_VERSION=2.4
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3
+TERMUX_PKG_SHA256=23677d40bf3b7621ba64593c978df40b1e026d8653c74a0599f0ead78ed92b51
 TERMUX_PKG_SRCURL=https://cache.ruby-lang.org/pub/ruby/${_MAJOR_VERSION}/ruby-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690
 # libbffi is used by the fiddle extension module:
-TERMUX_PKG_DEPENDS="libandroid-support, libffi, libgmp, readline, openssl, libutil"
+TERMUX_PKG_DEPENDS="libandroid-support, libffi, libgmp, readline, openssl, libutil, libyaml"
 # Needed to fix compilation on android:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_setgroups=no ac_cv_func_setresuid=no ac_cv_func_setreuid=no --enable-rubygems"
 # The gdbm module seems to be very little used:
@@ -18,8 +18,11 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" rb_cv_type_deprecated=x"
 # TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_getresuid=no"
 
 termux_step_pre_configure() {
-       export GEM_HOME=$TERMUX_PREFIX/var/lib/gems
-       mkdir -p $GEM_HOME
+       # This exception is to avoid a broken ruby on 32-bit arm
+       # with NDK r15c and ruby 2.4.2 - see #1520.
+       if [ "$TERMUX_ARCH" = arm ]; then
+               CFLAGS=${CFLAGS/Oz/O1}
+       fi
 }
 
 termux_step_make_install () {
@@ -36,9 +39,6 @@ termux_step_make_install () {
        perl -p -i -e 's/^.*CONFIG\["MKDIR_P"\].*$/  CONFIG["MKDIR_P"] = "mkdir -p"/' $RBCONFIG
        perl -p -i -e 's/^.*CONFIG\["EGREP"\].*$/  CONFIG["EGREP"] = "grep -E"/' $RBCONFIG
        perl -p -i -e 's/^.*CONFIG\["GREP"\].*$/  CONFIG["GREP"] = "grep"/' $RBCONFIG
-
-       # Fix mention of $_SPECSFLAG in rbconfig:
-       perl -p -i -e "s|${_SPECSFLAG}||g" $RBCONFIG
 }
 
 termux_step_post_massage () {