Sophie

Sophie

distrib > Arklinux > devel > i586 > by-pkgid > afc1c4652057b915bec73222d5416f05 > files > 4

ruby-1.9.2p180-1ark.src.rpm

--- ruby-1.9.2-p0/ext/tk/extconf.rb.multilib2~	2010-08-08 17:00:52.000000000 +0200
+++ ruby-1.9.2-p0/ext/tk/extconf.rb	2010-08-19 10:18:03.190003354 +0200
@@ -203,7 +203,7 @@ def get_shlib_path_head
     ].each{|dir|
       next unless File.directory?(dir)
 
-      path_dirs << "#{dir}/lib"
+      path_dirs << "#{dir}/lib64"
       path_dirs << "#{dir}" unless Dir.glob("#{dir}/lib*.*", File::FNM_CASEFOLD).empty?
 
       dirnames = []
@@ -866,9 +866,9 @@ def find_tcl(tcllib, stubs, version, *op
 
   default_paths.concat [
     RbConfig::CONFIG['libdir'],
-    File.join(RbConfig::CONFIG['exec_prefix'], 'lib'),
-    File.join(RbConfig::CONFIG['prefix'], 'lib'),
-    "/usr/local/lib", "/usr/pkg/lib", "/usr/contrib/lib", "/usr/lib"
+    File.join(RbConfig::CONFIG['exec_prefix'], 'lib64'),
+    File.join(RbConfig::CONFIG['prefix'], 'lib64'),
+    "/usr/local/lib64", "/usr/lib64"
   ].find_all{|dir| File.directory?(dir)} unless CROSS_COMPILING
 
   if TkLib_Config["ActiveTcl"].kind_of?(String)  # glob path
@@ -982,9 +982,9 @@ def find_tk(tklib, stubs, version, *opt_
 
   default_paths.concat [
     RbConfig::CONFIG['libdir'],
-    File.join(RbConfig::CONFIG['exec_prefix'], 'lib'),
-    File.join(RbConfig::CONFIG['prefix'], 'lib'),
-    "/usr/local/lib", "/usr/pkg/lib", "/usr/contrib/lib", "/usr/lib"
+    File.join(RbConfig::CONFIG['exec_prefix'], 'lib64'),
+    File.join(RbConfig::CONFIG['prefix'], 'lib64'),
+    "/usr/local/lib64", "/usr/lib64"
   ].find_all{|dir| File.directory?(dir)} unless CROSS_COMPILING
 
   if !CROSS_COMPILING and is_win32?
@@ -1188,7 +1188,7 @@ end
 
 def find_X11(*opt_paths)
   defaults =
-    [ "/usr/X11*/lib", "/usr/lib/X11*", "/usr/local/X11*", "/usr/openwin/lib" ]
+    [ "/usr/lib64", "/usr/X11*/lib64", "/usr/lib64/X11*", "/usr/local/X11*", "/usr/openwin/lib" ]
   paths = []
   opt_paths.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/'), File::FNM_CASEFOLD))}
   defaults.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/'), File::FNM_CASEFOLD))}