commit ec82ad236c5c254431772ff0fc05ff1446c47362
parent 4a9c299c86ba78b3dd8e1d4751511e1420e33765
Author: Steven Lawrance <stl@koffein.net>
Date: Mon, 24 Jun 2013 20:08:05 +0200
Load libc.so.7 instead of .6 on FreeBSD
Diffstat:
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/bin/sup b/bin/sup
@@ -106,8 +106,6 @@ end
## ncurses.so that's been compiled against libncursesw. (note the w.) why
## this works, i have no idea. much like pretty much every aspect of
## dealing with curses. cargo cult programming at its best.
-##
-## BSD users: if libc.so.6 is not found, try installing compat6x.
require 'dl/import'
require 'rbconfig'
module LibC
@@ -115,6 +113,7 @@ module LibC
setlocale_lib = case RbConfig::CONFIG['arch']
when /darwin/; "libc.dylib"
when /cygwin/; "cygwin1.dll"
+ when /freebsd/; "libc.so.7"
else; "libc.so.6"
end
@@ -127,9 +126,6 @@ module LibC
rescue RuntimeError => e
warn "cannot dlload setlocale(); ncurses wide character support probably broken."
warn "dlload error was #{e.class}: #{e.message}"
- if RbConfig::CONFIG['arch'] =~ /bsd/
- warn "BSD variant detected. You may have to install a compat6x package to acquire libc."
- end
end
end