X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/10f54605da7a56c19bf41e2c37a46d1058ab6355..84aa0d726896a68e1366af824d9bd6b9f489d736:/packages/ruby/build.sh

diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh
index 065fbe82..ae12a1c9 100644
--- a/packages/ruby/build.sh
+++ b/packages/ruby/build.sh
@@ -1,23 +1,26 @@
 TERMUX_PKG_HOMEPAGE=https://www.ruby-lang.org/
 TERMUX_PKG_DESCRIPTION="Dynamic programming language with a focus on simplicity and productivity"
 _MAJOR_VERSION=2.3
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1
-TERMUX_PKG_BUILD_REVISION=2
-TERMUX_PKG_SRCURL=http://cache.ruby-lang.org/pub/ruby/${_MAJOR_VERSION}/ruby-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3
+TERMUX_PKG_SRCURL=https://cache.ruby-lang.org/pub/ruby/${_MAJOR_VERSION}/ruby-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=1a4fa8c2885734ba37b97ffdb4a19b8fba0e8982606db02d936e65bac07419dc
 # libbffi is used by the fiddle extension module:
-TERMUX_PKG_DEPENDS="libffi, libgmp, readline, openssl, libutil"
-TERMUX_PKG_KEEP_HEADER_FILES="true"
+TERMUX_PKG_DEPENDS="libandroid-support, libffi, libgmp, readline, openssl, libutil"
 # 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:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --without-gdbm"
 # Do not link in libcrypt.so if available (now in disabled-packages):
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_lib_crypt_crypt=no"
+# Fix DEPRECATED_TYPE macro clang compatibility:
+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"
 
-# Ruby does not use this directly, but specify for gem building C++-using extensions:
-CXXFLAGS+=" -frtti -fexceptions" # -lgnustl_shared"
+termux_step_pre_configure() {
+	# Ruby does not use this directly, but specify for gem building C++-using extensions:
+	CXXFLAGS+=" -frtti -fexceptions"
 
-termux_step_pre_configure () {
 	export GEM_HOME=$TERMUX_PREFIX/var/lib/gems
 	mkdir -p $GEM_HOME
 }
@@ -42,8 +45,6 @@ termux_step_make_install () {
         perl -p -i -e 's/^.*CONFIG\["EGREP"\].*$/  CONFIG["EGREP"] = "grep -E"/' $RBCONFIG
         perl -p -i -e 's/^.*CONFIG\["GREP"\].*$/  CONFIG["GREP"] = "grep"/' $RBCONFIG
 
-        # Make C++-using gems link against libgnustl_shared instead of the limited system libstdc++:
-        perl -p -i -e 's/\(CXX\) -shared/\(CXX\) -shared -lgnustl_shared/' $RBCONFIG
 	# Fix mention of $_SPECSFLAG in rbconfig:
 	perl -p -i -e "s|${_SPECSFLAG}||g" $RBCONFIG
 }