X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/f34a276b5e9a0d74944c5af6a751f3cb65f06634..33d16b567fa1a363b85c896886b2746a46aa56a6:/packages/ruby/build.sh

diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh
index 7ff20e7e..a68a8721 100644
--- a/packages/ruby/build.sh
+++ b/packages/ruby/build.sh
@@ -2,13 +2,17 @@ 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}.3
-TERMUX_PKG_BUILD_REVISION=3
+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"
+TERMUX_PKG_DEPENDS="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"
+# 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"
 
 # Ruby does not use this directly, but specify for gem building C++-using extensions:
 CXXFLAGS+=" -frtti -fexceptions" # -lgnustl_shared"
@@ -25,7 +29,7 @@ termux_step_make_install () {
 
         # rbconfig.rb, used to build native gems, thinks that ${TERMUX_HOST_PLATFORM}-$TOOLNAME should
         # be used, but we want the unprefixed $TOOLNAME:
-        local RBCONFIG=$TERMUX_PREFIX/lib/ruby/${_MAJOR_VERSION}.0/arm-linux-androideabi/rbconfig.rb
+        local RBCONFIG=$TERMUX_PREFIX/lib/ruby/${_MAJOR_VERSION}.0/${TERMUX_HOST_PLATFORM}/rbconfig.rb
         for tool in gcc "g\+\+" strip nm objdump ar ranlib ld cpp; do
           perl -p -i -e "s/${TERMUX_HOST_PLATFORM}-$tool/$tool/g" $RBCONFIG
         done
@@ -39,8 +43,3 @@ termux_step_make_install () {
 	# Fix mention of $_SPECSFLAG in rbconfig:
 	perl -p -i -e "s|${_SPECSFLAG}||g" $RBCONFIG
 }
-
-
-# FIXME: 
-#       ruby -e 'p Encoding::default_external'
-# prints US-ASCII