You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
116 lines
3.2 KiB
116 lines
3.2 KiB
From 346e147ba6480839b87046e9a9efab0bf6ed3660 Mon Sep 17 00:00:00 2001 |
|
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com> |
|
Date: Wed, 10 Aug 2016 17:35:48 +0200 |
|
Subject: [PATCH] Rely on ldd to detect glibc. |
|
|
|
This is just workaround, since we know we are quite sure this will be successful |
|
on Red Hat platforms. |
|
|
|
This workaround rhbz#1361037 |
|
--- |
|
test/fiddle/helper.rb | 89 ------------------------------------------- |
|
1 file changed, 89 deletions(-) |
|
|
|
diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb |
|
index 1da3d93..65148a1 100644 |
|
--- a/test/fiddle/helper.rb |
|
+++ b/test/fiddle/helper.rb |
|
@@ -6,95 +6,6 @@ |
|
|
|
libc_so = libm_so = nil |
|
|
|
-case RUBY_PLATFORM |
|
-when /cygwin/ |
|
- libc_so = "cygwin1.dll" |
|
- libm_so = "cygwin1.dll" |
|
-when /linux/ |
|
- libdir = '/lib' |
|
- case [0].pack('L!').size |
|
- when 4 |
|
- # 32-bit ruby |
|
- libdir = '/lib32' if File.directory? '/lib32' |
|
- when 8 |
|
- # 64-bit ruby |
|
- libdir = '/lib64' if File.directory? '/lib64' |
|
- end |
|
- libc_so = File.join(libdir, "libc.so.6") |
|
- libm_so = File.join(libdir, "libm.so.6") |
|
-when /mingw/, /mswin/ |
|
- require "rbconfig" |
|
- crtname = RbConfig::CONFIG["RUBY_SO_NAME"][/msvc\w+/] || 'ucrtbase' |
|
- libc_so = libm_so = "#{crtname}.dll" |
|
-when /darwin/ |
|
- libc_so = "/usr/lib/libc.dylib" |
|
- libm_so = "/usr/lib/libm.dylib" |
|
-when /kfreebsd/ |
|
- libc_so = "/lib/libc.so.0.1" |
|
- libm_so = "/lib/libm.so.1" |
|
-when /gnu/ #GNU/Hurd |
|
- libc_so = "/lib/libc.so.0.3" |
|
- libm_so = "/lib/libm.so.6" |
|
-when /mirbsd/ |
|
- libc_so = "/usr/lib/libc.so.41.10" |
|
- libm_so = "/usr/lib/libm.so.7.0" |
|
-when /freebsd/ |
|
- libc_so = "/lib/libc.so.7" |
|
- libm_so = "/lib/libm.so.5" |
|
-when /bsd|dragonfly/ |
|
- libc_so = "/usr/lib/libc.so" |
|
- libm_so = "/usr/lib/libm.so" |
|
-when /solaris/ |
|
- libdir = '/lib' |
|
- case [0].pack('L!').size |
|
- when 4 |
|
- # 32-bit ruby |
|
- libdir = '/lib' if File.directory? '/lib' |
|
- when 8 |
|
- # 64-bit ruby |
|
- libdir = '/lib/64' if File.directory? '/lib/64' |
|
- end |
|
- libc_so = File.join(libdir, "libc.so") |
|
- libm_so = File.join(libdir, "libm.so") |
|
-when /aix/ |
|
- pwd=Dir.pwd |
|
- libc_so = libm_so = "#{pwd}/libaixdltest.so" |
|
- unless File.exist? libc_so |
|
- cobjs=%w!strcpy.o! |
|
- mobjs=%w!floats.o sin.o! |
|
- funcs=%w!sin sinf strcpy strncpy! |
|
- expfile='dltest.exp' |
|
- require 'tmpdir' |
|
- Dir.mktmpdir do |dir| |
|
- begin |
|
- Dir.chdir dir |
|
- %x!/usr/bin/ar x /usr/lib/libc.a #{cobjs.join(' ')}! |
|
- %x!/usr/bin/ar x /usr/lib/libm.a #{mobjs.join(' ')}! |
|
- %x!echo "#{funcs.join("\n")}\n" > #{expfile}! |
|
- require 'rbconfig' |
|
- if RbConfig::CONFIG["GCC"] = 'yes' |
|
- lflag='-Wl,' |
|
- else |
|
- lflag='' |
|
- end |
|
- flags="#{lflag}-bE:#{expfile} #{lflag}-bnoentry -lm" |
|
- %x!#{RbConfig::CONFIG["LDSHARED"]} -o #{libc_so} #{(cobjs+mobjs).join(' ')} #{flags}! |
|
- ensure |
|
- Dir.chdir pwd |
|
- end |
|
- end |
|
- end |
|
-else |
|
- libc_so = ARGV[0] if ARGV[0] && ARGV[0][0] == ?/ |
|
- libm_so = ARGV[1] if ARGV[1] && ARGV[1][0] == ?/ |
|
- if( !(libc_so && libm_so) ) |
|
- $stderr.puts("libc and libm not found: #{$0} <libc> <libm>") |
|
- end |
|
-end |
|
- |
|
-libc_so = nil if !libc_so || (libc_so[0] == ?/ && !File.file?(libc_so)) |
|
-libm_so = nil if !libm_so || (libm_so[0] == ?/ && !File.file?(libm_so)) |
|
- |
|
if !libc_so || !libm_so |
|
ruby = EnvUtil.rubybin |
|
ldd = `ldd #{ruby}` |
|
-- |
|
2.9.2 |
|
|
|
|