]> git.pld-linux.org Git - packages/ruby.git/commitdiff
- fix for X11 lib test on AMD64 auto/ac/ruby-1_8_1-4
authorJacek Konieczny <jajcus@pld-linux.org>
Tue, 6 Jan 2004 10:42:45 +0000 (10:42 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    ruby-tcltklib-lib64.patch -> 1.1

ruby-tcltklib-lib64.patch [new file with mode: 0644]

diff --git a/ruby-tcltklib-lib64.patch b/ruby-tcltklib-lib64.patch
new file mode 100644 (file)
index 0000000..c71eea5
--- /dev/null
@@ -0,0 +1,30 @@
+diff -dur ruby-1.8.1.orig/ext/tcltklib/extconf.rb ruby-1.8.1/ext/tcltklib/extconf.rb
+--- ruby-1.8.1.orig/ext/tcltklib/extconf.rb    2004-01-06 11:31:21.000000000 +0100
++++ ruby-1.8.1/ext/tcltklib/extconf.rb 2004-01-06 11:33:02.222170661 +0100
+@@ -18,7 +18,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/pkg/lib64", "/usr/lib64"]
+   func = stubs ? "Tcl_InitStubs" : "Tcl_FindExecutable"
+   if tcllib
+     find_library(tcllib, func, *paths)
+@@ -33,7 +33,7 @@
+ end
+ def find_tk(tklib, stubs)
+-  paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
++  paths = ["/usr/local/lib64", "/usr/pkg/lib64", "/usr/lib64"]
+   func = stubs ? "Tk_InitStubs" : "Tk_Init"
+   if tklib
+     find_library(tklib, func, *paths)
+@@ -49,7 +49,7 @@
+ if have_header("tcl.h") && have_header("tk.h") &&
+     (/mswin32|mingw|cygwin|bccwin32/ =~ RUBY_PLATFORM || find_library("X11", "XOpenDisplay",
+-      "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib")) &&
++      "/usr/X11/lib64", "/usr/lib64/X11", "/usr/X11R6/lib64", "/usr/openwin/lib64")) &&
+     find_tcl(tcllib, stubs) &&
+     find_tk(tklib, stubs)
+   $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs
This page took 0.055693 seconds and 4 git commands to generate.