8000 merge revision(s) 50717: [Backport #11201] · github/ruby@f81db3c · GitHub
[go: up one dir, main page]
Skip to content

Commit f81db3c

Browse files
unakunak
committed
merge revision(s) 50717: [Backport ruby#11201]
 * lib/mkmf.rb (pkg_config): split --libs if --libs-only-l option is not available. patch in [ruby-core:69428] by Hans Mackowiak. [ruby-core:69421] [Bug ruby#11201] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent bf57198 commit f81db3c

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

‎ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Fri Jul 3 18:40:48 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
2+
3+
* lib/mkmf.rb (pkg_config): split --libs if --libs-only-l option
4+
is not available. patch in [ruby-core:69428] by Hans Mackowiak.
5+
[ruby-core:69421] [Bug #11201]
6+
17
Fri Jul 3 18:32:37 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
28

39
* compile.c (iseq_compile_each): out of range NTH_REF is always

‎lib/mkmf.rb

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1756,11 +1756,18 @@ def pkg_config(pkg, option=nil)
17561756
elsif get and try_ldflags(ldflags = get['libs'])
17571757
cflags = get['cflags']
17581758
libs = get['libs-only-l']
1759-
ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ")
1760-
$CFLAGS += " " << cflags
1761-
$CXXFLAGS += " " << cflags
1762-
$LDFLAGS = [orig_ldflags, ldflags].join(' ')
1759+
if cflags
1760+
$CFLAGS += " " << cflags
1761+
$CXXFLAGS += " " << cflags
1762+
end
1763+
if libs
1764+
ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ")
1765+
else
1766+
libs, ldflags = Shellwords.shellwords(ldflags).partition {|s| s =~ /-l([^ ]+)/ }.map {|l|l.quote.join(" ")}
1767+
end
17631768
$libs += " " << libs
1769+
1770+
$LDFLAGS = [orig_ldflags, ldflags].join(' ')
17641771
Logging::message "package configuration for %s\n", pkg
17651772
Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n",
17661773
cflags, ldflags, libs

‎version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define RUBY_VERSION "2.1.7"
22
#define RUBY_RELEASE_DATE "2015-07-03"
3-
#define RUBY_PATCHLEVEL 373
3+
#define RUBY_PATCHLEVEL 374
44

55
#define RUBY_RELEASE_YEAR 2015
66
#define RUBY_RELEASE_MONTH 7

0 commit comments

Comments
 (0)
0