core: subseq-index? -> subseq-of?

[factor.git] / basis / alien / libraries / finder / linux / linux.factor

diff --git a/basis/alien/libraries/finder/linux/linux.factor b/basis/alien/libraries/finder/linux/linux.factor
index 4281c4e69c3cc8cc3885837d64a7a7333ba98ea2..58e5050da3b201bb7994e95eb8c788cb05a3c7ca 100644 (file)
--- a/basis/alien/libraries/finder/linux/linux.factor
+++ b/basis/alien/libraries/finder/linux/linux.factor
@@ -1,36 +1,59 @@
-! Copyright (C) 2013 Björn Lindqvist
+! Copyright (C) 2013 Björn Lindqvist, Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license
-
-USING: alien.libraries alien.libraries.finder assocs io
-io.encodings.utf8 io.launcher kernel sequences splitting system
-;
-
+USING: alien.libraries.finder arrays assocs
+combinators.short-circuit environment io io.encodings.utf8
+io.launcher kernel make sequences sets splitting system
+unicode ;
 IN: alien.libraries.finder.linux
 
 <PRIVATE
 
 CONSTANT: mach-map {
-    { ppc.64 "libc6,64bit" }
-    { x86.32 "libc6,x86-32" }
-    { x86.64 "libc6,x86-64" }
+    { ppc.64 { "libc6" "64bit" } }
+    { x86.32 { "libc6" "x32" } }
+    { x86.64 { "libc6" "x86-64" } }
 }
 
-: ldconfig-cache ( -- seq )
-    "/sbin/ldconfig -p" utf8 [ lines ] with-process-reader rest
-    [ "=>" "" replace "\t " split harvest ] map ;
-
-: ldconfig-filter ( -- str )
-    mach-map cpu of "libc6" or "(" ")" surround ;
-
-: ldconfig-matches? ( lib this-lib this-arch -- ? )
-    [ start 0 = ] [ ldconfig-filter = ] bi* and ;
-
-: ldconfig-find-soname ( lib -- seq )
-    ldconfig-cache [ first2 ldconfig-matches? ] with filter [ first ] map ;
+: parse-ldconfig-lines ( string -- triple )
+    [
+        "=>" split1 [ [ unicode:blank? ] trim ] bi@
+        [
+            " " split1 [ "()" in? ] trim "," split
+            [ [ unicode:blank? ] trim ] map
+            [ ": Linux" subseq-of? ] reject
+        ] dip 3array
+    ] map ;
+
+: load-ldconfig-cache ( -- seq )
+    "/sbin/ldconfig -p" utf8 [ read-lines ] with-process-reader*
+    2drop [ f ] [ rest parse-ldconfig-lines ] if-empty ;
+
+: ldconfig-arch ( -- str )
+    mach-map cpu of { "libc6" } or ;
+
+: name-matches? ( lib triple -- ? )
+    first swap ?head [ ?first CHAR: . = ] [ drop f ] if ;
+
+: arch-matches? ( lib triple -- ? )
+    [ drop ldconfig-arch ] [ second swap subset? ] bi* ;
+
+: ldconfig-matches? ( lib triple -- ? )
+    { [ name-matches? ] [ arch-matches? ] } 2&& ;
+
+: find-ldconfig ( name -- path/f )
+    "lib" prepend load-ldconfig-cache
+    [ ldconfig-matches? ] with find nip ?last ;
+
+:: find-ld ( name -- path/f )
+    "LD_LIBRARY_PATH" os-env [
+        [
+            "ld" , "-t" , ":" split [ "-L" , , ] each
+            "-o" , "/dev/null" , "-l" name append ,
+        ] { } make utf8 [ read-lines ] with-process-reader* 2drop
+        "lib" name append '[ _ subseq-of? ] find nip
+    ] [ f ] if* ;
 
 PRIVATE>
 
-M: linux find-library
-    "lib" ".so" surround ldconfig-find-soname [
-        { [ exists? ] [ file-info regular-file? ] } 1&&
-    ] map-find nip ;
+M: linux find-library*
+    { [ find-ldconfig ] [ find-ld ] } 1|| ;