From 3a6638274a0817edbfa28b25a8e6c428bc6d6d19 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 29 Nov 2015 08:12:53 -0500 Subject: [PATCH] Fix rbconfig.rb for other platforms than arm Should fix building nokogiri on i686 (closes #69). --- packages/ruby/build.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/packages/ruby/build.sh b/packages/ruby/build.sh index 7ff20e7ec..287bf5f41 100644 --- 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=3 +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" @@ -25,7 +25,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 +39,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