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

use DYLD_ROOT_PATH

Browse source 
With this, I can use jimmy's autobuilt dmg, which fails with the other two
variables due to containing two versions of libiconv.
This commit is contained in:
Joey Hess 2012-10-11 21:42:48 -04:00
parent 9b760150b7
commit b30656acea
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
standalone/osx/git-annex.app/Contents/MacOS/runshell
View file

@ -31,15 +31,17 @@ cd "$orig"
PATH=$base/bin:$PATH PATH=$base/bin:$PATH
export PATH export PATH
# Using DYLD_FALLBACK_LIBRARY_PATH rather than DYLD_LIBRARY_PATH, so as # This makes the linker first look in the library directories bundled
# not to force binaries to link against possibly the wrong versions of # in this app. Only if it fails to find a library there will a system
# libraries found in the path. With DYLD_FALLBACK_LIBRARY_PATH, the # library be used.
# system's versions of libraries will be used when possible, and otherwise #
# it will fall back to using the libraries bundled with this app. # This seems to work better than DYLD_LIBRARY_PATH, which can force
for lib in $(cat $base/libdirs); do # the wrong version of a library to be used, if the app bundles two
DYLD_FALLBACK_LIBRARY_PATH="$base/$lib:$DYLD_FALLBACK_LIBRARY_PATH" # different versions of a single library. And it seems to work better
done # than DYLD_FALLBACK_LIBRARY_PATH, which fails to override old system
export DYLD_FALLBACK_LIBRARY_PATH # versions of libraries when a program in the app needs a newer version.
DYLD_ROOT_PATH=$base
export DYLD_ROOT_PATH
GIT_EXEC_PATH=$base/git-core GIT_EXEC_PATH=$base/git-core
export GIT_EXEC_PATH export GIT_EXEC_PATH