steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This reverts commit 20a1c09a42.
locals-and-roots
John Benediktsson 2016-03-28 23:01:56 -07:00
parent 12350404f2
commit 26301fd5b0
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
basis/alien/libraries/finder/linux/linux-tests.factor
View File

@ -1,10 +1,5 @@
USING: alien.libraries.finder sequences tools.test USING: alien.libraries.finder sequences tools.test ;
alien.libraries.finder.linux.private ; IN: alien.libraries.fidner.linux
IN: alien.libraries.finder.linux
{ t } [ "libm.so" "m" find-library subseq? ] unit-test { t } [ "libm.so" "m" find-library subseq? ] unit-test
{ t } [ "libc.so" "c" 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

2
basis/alien/libraries/finder/linux/linux.factor
View File

@ -32,7 +32,7 @@ CONSTANT: mach-map {
mach-map cpu of { "libc6" } or ; mach-map cpu of { "libc6" } or ;
: name-matches? ( lib triple -- ? ) : name-matches? ( lib triple -- ? )
first swap ?head [ ?first ".-" member? ] [ drop f ] if ; first swap ?head [ ?first CHAR: . = ] [ drop f ] if ;
: arch-matches? ( lib triple -- ? ) : arch-matches? ( lib triple -- ? )
[ drop ldconfig-arch ] [ second swap subset? ] bi* ; [ drop ldconfig-arch ] [ second swap subset? ] bi* ;