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

fix install_name_tool library name replacement

Browse source
This commit is contained in:
Joey Hess 2014-01-15 13:05:07 -04:00
parent daec7ffafe
commit ff6854e5b4
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Build/OSXMkLibs.hs
View file

@ -42,6 +42,7 @@ installLibs :: FilePath -> [(FilePath, FilePath)] -> LibMap -> IO ([FilePath], [
installLibs appbase replacement_libs libmap = do installLibs appbase replacement_libs libmap = do
(needlibs, replacement_libs', libmap') <- otool appbase replacement_libs libmap (needlibs, replacement_libs', libmap') <- otool appbase replacement_libs libmap
libs <- forM needlibs $ \lib -> do libs <- forM needlibs $ \lib -> do
pathlib <- findLibPath lib
let shortlib = fromMaybe (error "internal") (M.lookup lib libmap') let shortlib = fromMaybe (error "internal") (M.lookup lib libmap')
let fulllib = dropWhile (== '/') lib let fulllib = dropWhile (== '/') lib
let dest = appbase </> fulllib let dest = appbase </> fulllib
@ -50,8 +51,8 @@ installLibs appbase replacement_libs libmap = do
( return Nothing ( return Nothing
, do , do
createDirectoryIfMissing True (parentDir dest) createDirectoryIfMissing True (parentDir dest)
putStrLn $ "installing " ++ lib ++ " as " ++ shortlib putStrLn $ "installing " ++ pathlib ++ " as " ++ shortlib
_ <- boolSystem "cp" [File lib, File dest] _ <- boolSystem "cp" [File pathlib, File dest]
_ <- boolSystem "chmod" [Param "644", File dest] _ <- boolSystem "chmod" [Param "644", File dest]
_ <- boolSystem "ln" [Param "-s", File fulllib, File symdest] _ <- boolSystem "ln" [Param "-s", File fulllib, File symdest]
return $ Just appbase return $ Just appbase
@ -60,9 +61,9 @@ installLibs appbase replacement_libs libmap = do
{- Returns libraries to install. {- Returns libraries to install.
- -
- Note that otool -L ignores DYLD_LIBRARY_PATH. But we do want to honor - Note that otool -L ignores DYLD_LIBRARY_PATH, so the
- that if set, so the library files found by otool are searched for on - library files returned may need to be run through findLibPath
- that path. - to find the actual libraries to install.
-} -}
otool :: FilePath -> [(FilePath, FilePath)] -> LibMap -> IO ([FilePath], [(FilePath, FilePath)], LibMap) otool :: FilePath -> [(FilePath, FilePath)] -> LibMap -> IO ([FilePath], [(FilePath, FilePath)], LibMap)
otool appbase replacement_libs libmap = do otool appbase replacement_libs libmap = do
@ -75,8 +76,7 @@ otool appbase replacement_libs libmap = do
process c [] rls m = return (nub $ concat c, rls, m) process c [] rls m = return (nub $ concat c, rls, m)
process c (file:rest) rls m = do process c (file:rest) rls m = do
_ <- boolSystem "chmod" [Param "755", File file] _ <- boolSystem "chmod" [Param "755", File file]
libs <- mapM findLibPath libs <- filter want . parseOtool
=<< filter want . parseOtool
<$> readProcess "otool" ["-L", file] <$> readProcess "otool" ["-L", file]
expanded_libs <- expand_rpath libs replacement_libs file expanded_libs <- expand_rpath libs replacement_libs file
let rls' = nub $ rls ++ (zip libs expanded_libs) let rls' = nub $ rls ++ (zip libs expanded_libs)