Project

General

Profile

Download (1.23 KB)

Bug #8595 » b.patch

sorah (Sorah Fukumori), 07/02/2013 11:20 AM

View differences:

ChangeLog
Tue Jul 2 11:14:36 2013 Shota Fukumori <sorah@cookpad.com>
* lib/mkmf.rb (try_config): Fix to not replaces $LDFLAGS with $libs
(1.9.3 behavior) [ruby-core:55752] [Bug #8595]
Tue Jul 2 00:39:59 2013 Tanaka Akira <akr@fsij.org>
* ext/socket/ipsocket.c (init_inetsock_internal): Don't try mismached
lib/mkmf.rb
# default to package specific config command, as a last resort.
get = proc {|opt| `#{pkgconfig} --#{opt}`.strip}
end
orig_ldflags = $LDFLAGS
if get and option
get[option]
elsif get and try_ldflags(ldflags = get['libs'])
......
libs = get['libs-only-l']
ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ")
$CFLAGS += " " << cflags
$LDFLAGS += " " << ldflags
$LDFLAGS = [orig_ldflags, ldflags].join(' ')
$libs += " " << libs
Logging::message "package configuration for %s\n", pkg
Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n",
(2-2/2)