Add rpath-link parameter for aarch64 build

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

diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh
index 4509fe9..287bf5f 100644 (file)
--- a/packages/ruby/build.sh
+++ b/packages/ruby/build.sh
@@ -2,7 +2,7 @@ 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=2
+TERMUX_PKG_BUILD_REVISION=4
 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"
@@ -23,21 +23,19 @@ termux_step_make_install () {
        make uninstall # remove possible remains to get fresh timestamps
        make install
 
-        # rbconfig.rb, used to build native gems, thinks that ${TERMUX_HOST_PLATFORM}-gcc should
-        # be used, but we want normal gcc
-        local RBCONFIG=$TERMUX_PREFIX/lib/ruby/${_MAJOR_VERSION}.0/arm-linux-androideabi/rbconfig.rb
+        # 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/${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
-        perl -p -i -e 's@"/bin/mkdir@"/system/bin/mkdir@' $RBCONFIG
-        perl -p -i -e "s@/usr/bin/install@$TERMUX_PREFIX/bin/applets/install@" $RBCONFIG
+
+       # Fix absolute paths to executables:
+        perl -p -i -e 's@"/bin/mkdir@"mkdir@' $RBCONFIG
+        perl -p -i -e "s@/usr/bin/install@install@" $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
 }
-
-
-# FIXME: 
-#       ruby -e 'p Encoding::default_external'
-# prints US-ASCII