X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/be9907f7721d4749a8dbe8f487bff686be6784bf..4d43513553a1f1a1ba8d0ad7e3af470fff2f0e75:/packages/ruby/build.sh?ds=sidebyside

diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh
index be3d756d..190a7b74 100644
--- a/packages/ruby/build.sh
+++ b/packages/ruby/build.sh
@@ -1,12 +1,12 @@
 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_REVISION=1
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2
+TERMUX_PKG_REVISION=2
+TERMUX_PKG_SHA256=748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735
 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,6 +18,14 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" rb_cv_type_deprecated=x"
 # getresuid(2) does not work on ChromeOS - https://github.com/termux/termux-app/issues/147:
 # TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_func_getresuid=no"
 
+termux_step_pre_configure() {
+	# 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 () {
 	make install
 	make uninstall # remove possible remains to get fresh timestamps