wrath/shaniqua-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

look for dynamic libraries when loading packages

Browse Source
This commit is contained in:
ulfn 2006-08-14 14:37:28 +00:00
parent 71cc0e9222
commit ec3e63ef8d
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/System/Plugins/Env.hs
View File

@ -358,6 +358,14 @@ mkSOName root = root
mkSOName root = "lib" ++ root ++ ".so" mkSOName root = "lib" ++ root ++ ".so"
#endif #endif
#if defined(MACOSX)
mkDynPkgName root = mkSOName (root ++ "_dyn")
#else
mkDynPkgName root = mkSOName root
#endif
data HSLib = Static FilePath | Dynamic FilePath
-- --
-- return any stuff to load for this package, plus the list of packages -- return any stuff to load for this package, plus the list of packages
-- this package depends on. which includes stuff we have to then load -- this package depends on. which includes stuff we have to then load
@ -386,7 +394,9 @@ lookupPkg' p = withPkgEnvs env $ \fms -> go fms p
#else #else
libdirs = libraryDirs package ++ ldOptsPaths libdirs = libraryDirs package ++ ldOptsPaths
#endif #endif
libs <- mapM (findHSlib libdirs) (hslibs ++ cbits) -- If we're loading dynamic libs we need the cbits to appear before the
-- real packages.
libs <- mapM (findHSlib libdirs) (cbits ++ hslibs)
#if defined(CYGWIN) || defined(__MINGW32__) #if defined(CYGWIN) || defined(__MINGW32__)
windowsos <- catch (getEnv "OS") windowsos <- catch (getEnv "OS")
(\e -> if isDoesNotExistError e then return "Windows_98" else ioError e) (\e -> if isDoesNotExistError e then return "Windows_98" else ioError e)
@ -401,7 +411,9 @@ lookupPkg' p = withPkgEnvs env $ \fms -> go fms p
#else #else
libs' <- mapM (findDLL libdirs) dlls libs' <- mapM (findDLL libdirs) dlls
#endif #endif
return (deppkgs, (filterRight libs,map (either id id) libs') ) let slibs = [ lib | Right (Static lib) <- libs ]
dlibs = [ lib | Right (Dynamic lib) <- libs ]
return (deppkgs, (slibs,map (either id id) libs' ++ dlibs) )
#if defined(CYGWIN) || defined(__MINGW32__) #if defined(CYGWIN) || defined(__MINGW32__)
-- replace $topdir -- replace $topdir
@ -422,16 +434,31 @@ lookupPkg' p = withPkgEnvs env $ \fms -> go fms p
-- --
-- Check that a path to a library actually reaches a library -- Check that a path to a library actually reaches a library
-- Problem: sysPkgSuffix is ".o", but extra libraries could be findHSlib' :: [FilePath] -> String -> IO (Maybe FilePath)
-- ".so" -- what to do? findHSlib' [] _ = return Nothing
-- findHSlib' (dir:dirs) lib = do
findHSlib :: [FilePath] -> String -> IO (Either String FilePath) let l = dir </> lib
findHSlib [] lib = return (Left lib)
findHSlib (dir:dirs) lib = do
let l = dir </> lib ++ sysPkgSuffix
b <- doesFileExist l b <- doesFileExist l
if b then return $ Right l -- found it! if b then return $ Just l -- found it!
else findHSlib dirs lib else findHSlib' dirs lib
findHSslib dirs lib = findHSlib' dirs $ lib ++ sysPkgSuffix
findHSdlib dirs lib = findHSlib' dirs $ mkDynPkgName lib
-- Problem: sysPkgSuffix is ".o", but extra libraries could be
-- ".so"
-- Solution: first look for static library, if we don't find it
-- look for a dynamic version.
findHSlib :: [FilePath] -> String -> IO (Either String HSLib)
findHSlib dirs lib = do
static <- findHSslib dirs lib
case static of
Just file -> return $ Right $ Static file
Nothing -> do
dynamic <- findHSdlib dirs lib
case dynamic of
Just file -> return $ Right $ Dynamic file
Nothing -> return $ Left lib
findDLL :: [FilePath] -> String -> IO (Either String FilePath) findDLL :: [FilePath] -> String -> IO (Either String FilePath)
findDLL [] lib = return (Left lib) findDLL [] lib = return (Left lib)