Rebase patches.

This commit is contained in:
Vít Ondruch 2014-01-06 13:48:46 +01:00
parent 0f37fb5c2c
commit 02ee7904a4
6 changed files with 14 additions and 14 deletions

View File

@ -13,7 +13,7 @@ diff --git a/Makefile.in b/Makefile.in
index 7e8ed82..7916993 100644 index 7e8ed82..7916993 100644
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -110,6 +110,7 @@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ @@ -114,6 +114,7 @@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@
XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
DEFAULT_PRELUDES = $(GEM_PRELUDE) DEFAULT_PRELUDES = $(GEM_PRELUDE)
@ -25,7 +25,7 @@ diff --git a/common.mk b/common.mk
index 5cfbc3d..3f0a82e 100644 index 5cfbc3d..3f0a82e 100644
--- a/common.mk --- a/common.mk
+++ b/common.mk +++ b/common.mk
@@ -110,7 +110,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) @@ -109,7 +109,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT)
GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
@ -38,7 +38,7 @@ diff --git a/configure.in b/configure.in
index 0e371e2..d4f1dcb 100644 index 0e371e2..d4f1dcb 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -3731,6 +3731,13 @@ AC_SUBST(rubyarchhdrdir)dnl @@ -3814,6 +3814,13 @@ AC_SUBST(rubyarchhdrdir)dnl
AC_SUBST(sitearchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl
AC_SUBST(vendorarchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl

View File

@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
index 37d9a62..553d4d0 100644 index 37d9a62..553d4d0 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -2956,6 +2956,11 @@ if test ${multiarch+set}; then @@ -3044,6 +3044,11 @@ if test ${multiarch+set}; then
fi fi
archlibdir='${libdir}/${arch}' archlibdir='${libdir}/${arch}'

View File

@ -13,7 +13,7 @@ diff --git a/configure.in b/configure.in
index 88d24ee..4a300b9 100644 index 88d24ee..4a300b9 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -3608,8 +3608,6 @@ AC_ARG_WITH(rubylibprefix, @@ -3618,8 +3618,6 @@ AS_CASE(["$target_os"],
rubyw_install_name='$(RUBYW_INSTALL_NAME)' rubyw_install_name='$(RUBYW_INSTALL_NAME)'
]) ])
@ -22,7 +22,7 @@ index 88d24ee..4a300b9 100644
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
AC_ARG_WITH(rubyarchprefix, AC_ARG_WITH(rubyarchprefix,
@@ -3639,6 +3637,7 @@ AC_ARG_WITH(ruby-version, @@ -3649,6 +3647,7 @@ AC_ARG_WITH(ruby-version,
[ruby_version=full]) [ruby_version=full])
unset RUBY_LIB_VERSION unset RUBY_LIB_VERSION
unset RUBY_LIB_VERSION_STYLE unset RUBY_LIB_VERSION_STYLE
@ -30,7 +30,7 @@ index 88d24ee..4a300b9 100644
AS_CASE(["$ruby_version"], AS_CASE(["$ruby_version"],
[full], [RUBY_LIB_VERSION_STYLE='3 /* full */'], [full], [RUBY_LIB_VERSION_STYLE='3 /* full */'],
[minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */']) [minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */'])
@@ -3655,30 +3654,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then @@ -3665,30 +3664,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`" ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
eval $ruby_version eval $ruby_version
elif test -z "${ruby_version}"; then elif test -z "${ruby_version}"; then

View File

@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
index 553d4d0..03a4152 100644 index 553d4d0..03a4152 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -3647,6 +3647,8 @@ AC_SUBST(vendorarchdir)dnl @@ -3730,6 +3730,8 @@ AC_SUBST(vendorarchdir)dnl
AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl

View File

@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in
index 03a4152..0e371e2 100644 index 03a4152..0e371e2 100644
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -3621,6 +3621,10 @@ AC_ARG_WITH(vendorarchdir, @@ -3704,6 +3704,10 @@ AC_ARG_WITH(vendorarchdir,
[vendorarchdir=$withval], [vendorarchdir=$withval],
[vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}]) [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644
if test "${LOAD_RELATIVE+set}"; then if test "${LOAD_RELATIVE+set}"; then
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
RUBY_EXEC_PREFIX='' RUBY_EXEC_PREFIX=''
@@ -3644,6 +3648,7 @@ AC_SUBST(sitearchdir)dnl @@ -3727,6 +3731,7 @@ AC_SUBST(sitearchdir)dnl
AC_SUBST(vendordir)dnl AC_SUBST(vendordir)dnl
AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorlibdir)dnl
AC_SUBST(vendorarchdir)dnl AC_SUBST(vendorarchdir)dnl
@ -38,7 +38,7 @@ diff --git a/loadpath.c b/loadpath.c
index 623dc9d..74c5d9e 100644 index 623dc9d..74c5d9e 100644
--- a/loadpath.c --- a/loadpath.c
+++ b/loadpath.c +++ b/loadpath.c
@@ -86,6 +86,10 @@ const char ruby_initial_load_paths[] = @@ -94,6 +94,10 @@ const char ruby_initial_load_paths[] =
#endif #endif
#endif #endif
@ -67,7 +67,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index b47b6e1..0b99408 100755 index b47b6e1..0b99408 100755
--- a/tool/rbinstall.rb --- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb +++ b/tool/rbinstall.rb
@@ -317,6 +317,7 @@ sitelibdir = CONFIG["sitelibdir"] @@ -324,6 +324,7 @@ sitelibdir = CONFIG["sitelibdir"]
sitearchlibdir = CONFIG["sitearchdir"] sitearchlibdir = CONFIG["sitearchdir"]
vendorlibdir = CONFIG["vendorlibdir"] vendorlibdir = CONFIG["vendorlibdir"]
vendorarchlibdir = CONFIG["vendorarchdir"] vendorarchlibdir = CONFIG["vendorarchdir"]
@ -75,7 +75,7 @@ index b47b6e1..0b99408 100755
mandir = CONFIG["mandir", true] mandir = CONFIG["mandir", true]
docdir = CONFIG["docdir", true] docdir = CONFIG["docdir", true]
configure_args = Shellwords.shellwords(CONFIG["configure_args"]) configure_args = Shellwords.shellwords(CONFIG["configure_args"])
@@ -505,7 +506,15 @@ end @@ -512,7 +513,15 @@ end
install?(:local, :comm, :lib) do install?(:local, :comm, :lib) do
prepare "library scripts", rubylibdir prepare "library scripts", rubylibdir
noinst = %w[README* *.txt *.rdoc *.gemspec] noinst = %w[README* *.txt *.rdoc *.gemspec]

View File

@ -19,7 +19,7 @@ diff --git a/ChangeLog b/ChangeLog
index 72eaa6f..93686e9 100644 index 72eaa6f..93686e9 100644
--- a/ChangeLog --- a/ChangeLog
+++ b/ChangeLog +++ b/ChangeLog
@@ -1,6 +1,13 @@ @@ -67,6 +67,13 @@
install win32.h. install win32.h.
[ruby-core:58801][Bug #9199] reported by arton. [ruby-core:58801][Bug #9199] reported by arton.