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

work around git path-defying behavior that broke "git annex" in standalone tarball, while "git-annex" worked

Browse source
This commit is contained in:
Joey Hess 2013-12-16 20:47:48 -04:00
parent f3c9ecd65a
commit 604e6b87fb
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -143,13 +143,16 @@ linuxstandalone: Build/Standalone
find $(LINUXSTANDALONE_DEST) -type d -name gconv | head -n 1 | sed 's!$(LINUXSTANDALONE_DEST)/*!!' > $(LINUXSTANDALONE_DEST)/gconvdir find $(LINUXSTANDALONE_DEST) -type d -name gconv | head -n 1 | sed 's!$(LINUXSTANDALONE_DEST)/*!!' > $(LINUXSTANDALONE_DEST)/gconvdir
find $(LINUXSTANDALONE_DEST) | grep ld-linux | head -n 1 | sed 's!$(LINUXSTANDALONE_DEST)/*!!' > $(LINUXSTANDALONE_DEST)/linker find $(LINUXSTANDALONE_DEST) | grep ld-linux | head -n 1 | sed 's!$(LINUXSTANDALONE_DEST)/*!!' > $(LINUXSTANDALONE_DEST)/linker
# Install linker shim for each binary. # Install linker shim for each binary. Note that each binary is put
# in its own separate directory, to avoid eg git looking for
# binaries in its directory rather than in PATH.
for file in $$(find "$(LINUXSTANDALONE_DEST)" -type f); do \ for file in $$(find "$(LINUXSTANDALONE_DEST)" -type f); do \
if file "$$file" | grep ELF | grep -q executable; then \ if file "$$file" | grep ELF | grep -q executable; then \
mkdir -p "$(LINUXSTANDALONE_DEST)/shimmed"; \ base=$$(basename "$$file"); \
mv "$$file" "$(LINUXSTANDALONE_DEST)/shimmed"; \ mkdir -p "$(LINUXSTANDALONE_DEST)/shimmed/$$base"; \
mv "$$file" "$(LINUXSTANDALONE_DEST)/shimmed/$$base/"; \
echo "#!/bin/sh" > "$$file"; \ echo "#!/bin/sh" > "$$file"; \
echo "exec \"\$$GIT_ANNEX_LINKER\" --library-path \"\$$GIT_ANNEX_LD_LIBRARY_PATH\" \"\$$GIT_ANNEX_SHIMMED/$$(basename "$$file")\" \"\$$@\"" >> "$$file"; \ echo "exec \"\$$GIT_ANNEX_LINKER\" --library-path \"\$$GIT_ANNEX_LD_LIBRARY_PATH\" \"\$$GIT_ANNEX_SHIMMED/$$base/$$base\" \"\$$@\"" >> "$$file"; \
chmod +x "$$file"; \ chmod +x "$$file"; \
fi; \ fi; \
done done