From 76d22fff1897169d125809b7f78229fb8b26e096 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 10 May 2016 14:41:33 -0400 Subject: [PATCH] Make ruby link against libandroid-support Fixes #262. --- packages/ruby/build.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh index 065fbe82..73ecfab6 100644 --- a/packages/ruby/build.sh +++ b/packages/ruby/build.sh @@ -2,10 +2,10 @@ 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_BUILD_REVISION=3 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" @@ -42,8 +42,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 } -- 2.11.0