mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Linux standalone build now includes its own glibc and forces the linker to use it, to remove dependence on the host glibc.

Browse source
This commit is contained in:
Joey Hess 2013-12-16 01:51:19 -04:00
parent 2a285e8b1a
commit 99f6dd01b4
6 changed files with 48 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

21
standalone/linux/runshell
View file

@ -46,12 +46,20 @@ export ORIG_PATH
PATH=$base/bin:$PATH
export PATH
ORIG_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
export ORIG_LD_LIBRARY_PATH
# This is used by the shim wrapper around each binary.
for lib in $(cat $base/libdirs); do
LD_LIBRARY_PATH="$base/$lib:$LD_LIBRARY_PATH"
GIT_ANNEX_LD_LIBRARY_PATH="$base/$lib:$GIT_ANNEX_LD_LIBRARY_PATH"
done
export LD_LIBRARY_PATH
export GIT_ANNEX_LD_LIBRARY_PATH
GIT_ANNEX_LINKER=$(cat $base/linker)
export GIT_ANNEX_LINKER
GIT_ANNEX_SHIMMED="$base/shimmed"
export GIT_ANNEX_SHIMMED
ORIG_GCONV_PATH="$GCONV_PATH"
export ORIG_GCONV_PATH
GCONV_PATH=$base/$(cat $base/gconvdir)
export GCONV_PATH
ORIG_GIT_EXEC_PATH="$GIT_EXEC_PATH"
export ORIG_GIT_EXEC_PATH
@ -68,8 +76,9 @@ export ORIG_MANPATH
MANPATH="$base/usr/share/man:$MANPATH"
export MANPATH
# Indicate which variables were exported above.
GIT_ANNEX_STANDLONE_ENV="PATH LD_LIBRARY_PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR MANPATH"
# Indicate which variables were exported above and should be cleaned
# when running non-bundled programs.
GIT_ANNEX_STANDLONE_ENV="PATH GCONV_PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR MANPATH"
export GIT_ANNEX_STANDLONE_ENV
if [ "$1" ]; then