|
|
Author: tagoh
Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21067
Modified Files:
ruby.spec
Added Files:
ruby-tcltk-multilib.patch
Removed Files:
ruby-1.8.2-tcltk-multilib.patch
Log Message:
ruby-tcltk-multilib.patch:
extconf.rb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE ruby-tcltk-multilib.patch ---
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
Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ruby.spec 16 Dec 2005 10:38:22 -0000 1.48
+++ ruby.spec 16 Dec 2005 10:46:41 -0000 1.49
@@ -23,7 +23,7 @@
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
--- ruby-1.8.2-tcltk-multilib.patch DELETED ---
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|