Fix rbconfig.rb for other platforms than arm

Should fix building nokogiri on i686 (closes #69).
This commit is contained in:
Fredrik Fornwall 2015-11-29 08:12:53 -05:00
parent 00afbe13d4
commit 3a6638274a
1 changed files with 2 additions and 7 deletions

View File

@ -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" TERMUX_PKG_DESCRIPTION="Dynamic programming language with a focus on simplicity and productivity"
_MAJOR_VERSION=2.2 _MAJOR_VERSION=2.2
TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3 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 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: # libbffi is used by the fiddle extension module:
TERMUX_PKG_DEPENDS="libffi, libgmp, readline, openssl" 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 # rbconfig.rb, used to build native gems, thinks that ${TERMUX_HOST_PLATFORM}-$TOOLNAME should
# be used, but we want the unprefixed $TOOLNAME: # 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 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 perl -p -i -e "s/${TERMUX_HOST_PLATFORM}-$tool/$tool/g" $RBCONFIG
done done
@ -39,8 +39,3 @@ termux_step_make_install () {
# Fix mention of $_SPECSFLAG in rbconfig: # Fix mention of $_SPECSFLAG in rbconfig:
perl -p -i -e "s|${_SPECSFLAG}||g" $RBCONFIG perl -p -i -e "s|${_SPECSFLAG}||g" $RBCONFIG
} }
# FIXME:
# ruby -e 'p Encoding::default_external'
# prints US-ASCII