diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 3 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Wed Jul 3 23:31:26 2013 Shota Fukumori <sorah@cookpad.com> + + * lib/mkmf.rb (try_config): Fix to not replace $LDFLAGS with $libs + (1.9.3 behavior) [ruby-core:55752] [Bug #8595] + Tue Jul 2 03:06:38 2013 Kenta Murata <mrkn@mrkn.jp> * ext/bigdecimal/bigdecimal.c (BigMath_s_exp): Fix for the cases when diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d4d5846bfc..6fec4bd8f4 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1709,12 +1709,13 @@ SRC # default to package specific config command, as a last resort. get = proc {|opt| `#{pkgconfig} --#{opt}`.strip} end + orig_ldflags = $LDFLAGS if get and try_ldflags(ldflags = get['libs']) cflags = get['cflags'] 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", @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-07-02" -#define RUBY_PATCHLEVEL 249 +#define RUBY_RELEASE_DATE "2013-07-03" +#define RUBY_PATCHLEVEL 250 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 2 +#define RUBY_RELEASE_DAY 3 #include "ruby/version.h" |