sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not use /system/bin/{mkdir,install} in rbconfib

Browse Source 
Using executables in /system/bin is fragile since they may not
work due to LD_LIBRARY_PATH containing libraries with the same
name that the executables are linked against (but with different
versions).
This commit is contained in:
Fredrik Fornwall 2015-11-13 21:28:30 -05:00
parent 50691ee47d
commit f34a276b5e
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/ruby/build.sh
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"
_MAJOR_VERSION=2.2
TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3
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"
@ -23,14 +23,17 @@ 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
# 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
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: