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

merge revision(s) 39841: [Backport #8115]

Browse source 
* lib/mkmf.rb (install_dirs, with_destdir): prefix with DESTDIR
	  directories to install only unless bundled extension libraries.
	  [ruby-core:53502] [Bug #8115]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-06-08 17:37:25 +00:00
parent f31a47fdae
commit fdae1084ba
3 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Jun 9 02:27:07 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (install_dirs, with_destdir): prefix with DESTDIR
directories to install only unless bundled extension libraries.
[ruby-core:53502] [Bug #8115]
Sun Jun 9 02:17:16 2013 Charlie Somerville <charliesome@ruby-lang.org> Sun Jun 9 02:17:16 2013 Charlie Somerville <charliesome@ruby-lang.org>
* class.c (include_modules_at): invalidate method cache if included * class.c (include_modules_at): invalidate method cache if included

29
lib/mkmf.rb
View file

@ -189,21 +189,21 @@ module MakeMakefile
] ]
elsif $configure_args.has_key?('--vendor') elsif $configure_args.has_key?('--vendor')
dirs = [ dirs = [
['BINDIR', '$(bindir)'], ['BINDIR', '$(DESTDIR)$(bindir)'],
['RUBYCOMMONDIR', '$(vendordir)$(target_prefix)'], ['RUBYCOMMONDIR', '$(DESTDIR)$(vendordir)$(target_prefix)'],
['RUBYLIBDIR', '$(vendorlibdir)$(target_prefix)'], ['RUBYLIBDIR', '$(DESTDIR)$(vendorlibdir)$(target_prefix)'],
['RUBYARCHDIR', '$(vendorarchdir)$(target_prefix)'], ['RUBYARCHDIR', '$(DESTDIR)$(vendorarchdir)$(target_prefix)'],
['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'], ['HDRDIR', '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'],
['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], ['ARCHHDRDIR', '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
] ]
else else
dirs = [ dirs = [
['BINDIR', '$(bindir)'], ['BINDIR', '$(DESTDIR)$(bindir)'],
['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'], ['RUBYCOMMONDIR', '$(DESTDIR)$(sitedir)$(target_prefix)'],
['RUBYLIBDIR', '$(sitelibdir)$(target_prefix)'], ['RUBYLIBDIR', '$(DESTDIR)$(sitelibdir)$(target_prefix)'],
['RUBYARCHDIR', '$(sitearchdir)$(target_prefix)'], ['RUBYARCHDIR', '$(DESTDIR)$(sitearchdir)$(target_prefix)'],
['HDRDIR', '$(rubyhdrdir)/ruby$(target_prefix)'], ['HDRDIR', '$(DESTDIR)$(rubyhdrdir)/ruby$(target_prefix)'],
['ARCHHDRDIR', '$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'], ['ARCHHDRDIR', '$(DESTDIR)$(rubyhdrdir)/$(arch)/ruby$(target_prefix)'],
] ]
end end
dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")] dirs << ['target_prefix', (target_prefix ? "/#{target_prefix}" : "")]
@ -1728,6 +1728,7 @@ SRC
end end
def with_destdir(dir) def with_destdir(dir)
return dir unless $extmk
dir = dir.sub($dest_prefix_pattern, '') dir = dir.sub($dest_prefix_pattern, '')
/\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir /\A\$[\(\{]/ =~ dir ? dir : "$(DESTDIR)"+dir
end end
@ -1786,8 +1787,8 @@ ECHO = $(ECHO1:0=@echo)
#### Start of system configuration section. #### #### Start of system configuration section. ####
#{"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/") if $extmk} #{"top_srcdir = " + $top_srcdir.sub(%r"\A#{Regexp.quote($topdir)}/", "$(topdir)/") if $extmk}
srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2]).unspace}} srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {mkintpath(CONFIG[$1||$2]).unspace}}
topdir = #{mkintpath($extmk ? CONFIG["topdir"] : $topdir).unspace} topdir = #{mkintpath(topdir = $extmk ? CONFIG["topdir"] : $topdir).unspace}
hdrdir = #{mkintpath(CONFIG["hdrdir"]).unspace} hdrdir = #{(hdrdir = CONFIG["hdrdir"]) == topdir ? "$(topdir)" : mkintpath(hdrdir).unspace}
arch_hdrdir = #{$arch_hdrdir.quote} arch_hdrdir = #{$arch_hdrdir.quote}
PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']} PATH_SEPARATOR = #{CONFIG['PATH_SEPARATOR']}
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-06-09" #define RUBY_RELEASE_DATE "2013-06-09"
#define RUBY_PATCHLEVEL 213 #define RUBY_PATCHLEVEL 214
#define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 6