rpms
/
ruby
7
0
Fork 0
Code Issues Pull Requests Releases Activity

*** empty log message ***

This commit is contained in:
Akira TAGOH 2005-12-16 10:46:41 +00:00
parent b3723722dd
commit 1cfcc9deef
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ruby-tcltk-multilib.patch Normal file
View File

@ -0,0 +1,30 @@
diff -ruN ruby-1.8.4.orig/ext/tk/extconf.rb ruby-1.8.4/ext/tk/extconf.rb
--- ruby-1.8.4.orig/ext/tk/extconf.rb 2005-11-02 20:28:40.000000000 +0900
+++ ruby-1.8.4/ext/tk/extconf.rb 2005-12-16 19:44:57.000000000 +0900
@@ -48,7 +48,7 @@
stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
def find_tcl(tcllib, stubs)
- paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
+ paths = ["/usr/local/lib64", "/usr/local/lib" "/usr/pkg/lib64", "/usr/pkg/lib" "/usr/lib64" "/usr/lib"]
if stubs
func = "Tcl_InitStubs"
lib = "tclstub"
@@ -71,7 +71,7 @@
end
def find_tk(tklib, stubs)
- paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
+ paths = ["/usr/local/lib64" "/usr/local/lib", "/usr/pkg/lib64" "/usr/pkg/lib", "/usr/lib64" "/usr/lib"]
if stubs
func = "Tk_InitStubs"
lib = "tkstub"
@@ -274,7 +274,7 @@
if tcltk_framework ||
(have_header("tcl.h") && have_header("tk.h") &&
(is_win32 || find_library("X11", "XOpenDisplay",
- "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib")) &&
+ "/usr/X11/lib64" "/usr/X11/lib", "/usr/lib64/X11" "/usr/lib/X11", "/usr/X11R6/lib64" "/usr/X11R6/lib", "/usr/openwin/lib64" "/usr/openwin/lib")) &&
find_tcl(tcllib, stubs) &&
find_tk(tklib, stubs))
$CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs

2
ruby.spec
View File

@ -23,7 +23,7 @@ Source10: ruby-mode-init.el
Patch1: ruby-multilib.patch
Patch3: ruby-1.8.2-deadcode.patch
Patch4: ruby-1.8.2-tcltk-multilib.patch
Patch4: ruby-tcltk-multilib.patch
Summary: An interpreter of object-oriented scripting language
Group: Development/Languages