archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 10:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 50717: [Backport #11201]

Browse source 
* 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 #11201]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-07-03 20:13:46 +00:00
parent 72fa2ec34a
commit 7b2a41d317
3 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Jul 4 05:00:48 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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 #11201]
Sat Jul 4 04:46:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jul 4 04:46:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (iseq_compile_each): out of range NTH_REF is always * compile.c (iseq_compile_each): out of range NTH_REF is always

15
lib/mkmf.rb
View file

@ -1785,11 +1785,18 @@ SRC
cflags = get['cflags'] cflags = get['cflags']
end end
libs = get['libs-only-l'] libs = get['libs-only-l']
ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ") if cflags
$CFLAGS += " " << cflags $CFLAGS += " " << cflags
$CXXFLAGS += " " << cflags $CXXFLAGS += " " << cflags
$LDFLAGS = [orig_ldflags, ldflags].join(' ') end
if libs
ldflags = (Shellwords.shellwords(ldflags) - Shellwords.shellwords(libs)).quote.join(" ")
else
libs, ldflags = Shellwords.shellwords(ldflags).partition {|s| s =~ /-l([^ ]+)/ }.map {|l|l.quote.join(" ")}
end
$libs += " " << libs $libs += " " << libs
$LDFLAGS = [orig_ldflags, ldflags].join(' ')
Logging::message "package configuration for %s\n", pkg Logging::message "package configuration for %s\n", pkg
Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n", Logging::message "cflags: %s\nldflags: %s\nlibs: %s\n\n",
cflags, ldflags, libs cflags, ldflags, libs

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.3" #define RUBY_VERSION "2.2.3"
#define RUBY_RELEASE_DATE "2015-07-04" #define RUBY_RELEASE_DATE "2015-07-04"
#define RUBY_PATCHLEVEL 145 #define RUBY_PATCHLEVEL 146
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 7 #define RUBY_RELEASE_MONTH 7