Revert "alien.libraries.finder: Allow library to match just by name. Related to ...

This reverts commit 20a1c09a423455eca9e3c079969ffe896f31b81d.

diff --git a/basis/alien/libraries/finder/linux/linux-tests.factor b/basis/alien/libraries/finder/linux/linux-tests.factor
index 3b5bc2cb39d249456607afbfc14f4ea27234ece4..416217560f39e71d4e6ead7c0038d0567870bb17 100644 (file)
--- a/basis/alien/libraries/finder/linux/linux-tests.factor
+++ b/basis/alien/libraries/finder/linux/linux-tests.factor
@@ -1,10 +1,5 @@
-USING: alien.libraries.finder sequences tools.test
-alien.libraries.finder.linux.private ;
-IN: alien.libraries.finder.linux
+USING: alien.libraries.finder sequences tools.test ;
+IN: alien.libraries.fidner.linux
 
 { t } [ "libm.so" "m" find-library subseq? ] unit-test
 { t } [ "libc.so" "c" find-library subseq? ] unit-test
-
-{ t } [ "libSDL" { "libSDL-1.2.so.0" f f } name-matches? ] unit-test
-{ t } [ "libSDL-1" { "libSDL-1.2.so.0" f f } name-matches? ] unit-test
-{ t } [ "libSDL-1.2" { "libSDL-1.2.so.0" f f } name-matches? ] unit-test

diff --git a/basis/alien/libraries/finder/linux/linux.factor b/basis/alien/libraries/finder/linux/linux.factor
index 234d688526a72b6763fcedc8b4a17fbe1f868b67..406cb9a41e582199006760829e8839099a5c6b4c 100644 (file)
--- a/basis/alien/libraries/finder/linux/linux.factor
+++ b/basis/alien/libraries/finder/linux/linux.factor
@@ -32,7 +32,7 @@ CONSTANT: mach-map {
     mach-map cpu of { "libc6" } or ;
 
 : name-matches? ( lib triple -- ? )
-    first swap ?head [ ?first ".-" member? ] [ drop f ] if ;
+    first swap ?head [ ?first CHAR: . = ] [ drop f ] if ;
 
 : arch-matches? ( lib triple -- ? )
     [ drop ldconfig-arch ] [ second swap subset? ] bi* ;