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

OSX git-annex.app: Fix a regression that broke git-remote-https, git-remote-http, and git-shell

Browse source 
Putting the binaries in bundle/git-core/bin didn't work on OSX,
linker can't find the libraries next to those binaries where it expects to.
So instead put the binaries in the progDir.
This commit is contained in:
Joey Hess 2019-11-14 16:15:42 -04:00
parent 28733a3f5a
commit f037ad92ec
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Build/Standalone.hs
View file

@ -58,8 +58,9 @@ installGitLibs topdir = do
-- many git-core files may symlink to eg -- many git-core files may symlink to eg
-- ../../bin/git, which is located outside -- ../../bin/git, which is located outside
-- the git-core directory. The target of -- the git-core directory. The target of
-- such links is installed into a bin -- such links is installed into the progDir
-- directory, and the links repointed to it. -- (if not already there), and the links
-- repointed to it.
-- --
-- Other git-core files symlink to a file -- Other git-core files symlink to a file
-- beside them in the directory. Those -- beside them in the directory. Those
@ -68,7 +69,8 @@ installGitLibs topdir = do
if takeFileName linktarget == linktarget if takeFileName linktarget == linktarget
then cp f destf then cp f destf
else do else do
let linktarget' = gitcoredestdir </> "bin" </> takeFileName linktarget let linktarget' = progDir topdir
unlessM (doesFileExist linktarget') $ do
createDirectoryIfMissing True (takeDirectory linktarget') createDirectoryIfMissing True (takeDirectory linktarget')
L.readFile f >>= L.writeFile linktarget' L.readFile f >>= L.writeFile linktarget'
nukeFile destf nukeFile destf

2
CHANGELOG
View file

@ -6,6 +6,8 @@ git-annex (7.20191107) UNRELEASED; urgency=medium
* Fix a crash (STM deadlock) when -J is used with multiple files * Fix a crash (STM deadlock) when -J is used with multiple files
that point to the same key. that point to the same key.
* linuxstandalone: Fix a regression that broke git-remote-https. * linuxstandalone: Fix a regression that broke git-remote-https.
* OSX git-annex.app: Fix a regression that broke git-remote-https,
git-remote-http, and git-shell.
-- Joey Hess <id@joeyh.name> Mon, 11 Nov 2019 15:59:47 -0400 -- Joey Hess <id@joeyh.name> Mon, 11 Nov 2019 15:59:47 -0400