X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/543007aa11781fc250badf4f300b70651922b2e7..a8dfe86253f9b5b2f2fef48abef4369dfde0a1ec:/packages/ruby/build.sh

diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh
index 3c5e3b2b..4e58b228 100644
--- a/packages/ruby/build.sh
+++ b/packages/ruby/build.sh
@@ -1,10 +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.2
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.4
+_MAJOR_VERSION=2.3
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1
+TERMUX_PKG_BUILD_REVISION=5
 TERMUX_PKG_SRCURL=http://cache.ruby-lang.org/pub/ruby/${_MAJOR_VERSION}/ruby-${TERMUX_PKG_VERSION}.tar.xz
 # libbffi is used by the fiddle extension module:
-TERMUX_PKG_DEPENDS="libffi, libgmp, readline, openssl, libutil"
+TERMUX_PKG_DEPENDS="libandroid-support, libffi, libgmp, readline, openssl, libutil"
 TERMUX_PKG_KEEP_HEADER_FILES="true"
 # 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"
@@ -12,6 +13,8 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_setgroups=no ac_cv_func_setresuid=no
 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"
 
 # Ruby does not use this directly, but specify for gem building C++-using extensions:
 CXXFLAGS+=" -frtti -fexceptions" # -lgnustl_shared"
@@ -34,11 +37,19 @@ termux_step_make_install () {
         done
 
 	# Fix absolute paths to executables:
-        perl -p -i -e 's@"/bin/mkdir@"mkdir@' $RBCONFIG
-        perl -p -i -e "s@/usr/bin/install@install@" $RBCONFIG
+        perl -p -i -e 's/^.*CONFIG\["INSTALL"\].*$/  CONFIG["INSTALL"] = "install -c"/' $RBCONFIG
+        perl -p -i -e 's/^.*CONFIG\["PKG_CONFIG"\].*$/  CONFIG["PKG_CONFIG"] = "pkg-config"/' $RBCONFIG
+        perl -p -i -e 's/^.*CONFIG\["MAKEDIRS"\].*$/  CONFIG["MAKEDIRS"] = "mkdir -p"/' $RBCONFIG
+        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
 
-        # 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
 }
+
+termux_step_post_massage () {
+        if [ ! -f $TERMUX_PREFIX/lib/ruby/${_MAJOR_VERSION}.0/${TERMUX_HOST_PLATFORM}/readline.so ]; then
+                echo "Error: The readline extension was not built"
+        fi
+}