Skip to content

Update to upstream 2.1.5 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbussink merged 10 commits into from
Nov 14, 2014
Merged

Update to upstream 2.1.5 #22

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
205003b
* version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.5.
nagachika Oct 28, 2014
35168b8
merge revision(s) r48174: [Backport #10438]
nagachika Oct 28, 2014
ac3ac78
merge revision(s) r48222: [Backport #10464] [Backport #10465]
nagachika Nov 4, 2014
1d665c3
merge revision(s) r46397: [Backport #10434]
nagachika Nov 4, 2014
901dcec
merge revision(s) r48184: [Backport #10272] [Backport #10438]
nagachika Nov 4, 2014
e5db49c
merge revision(s) 48288: [Backport #9681]
nagachika Nov 6, 2014
d4239a9
merge revision(s) r47860: [Backport #10350]
nagachika Nov 6, 2014
eac759b
merge revision(s) r48402:
nagachika Nov 13, 2014
0d74082
add tag v2_1_5
nagachika Nov 13, 2014
9d08974
Merge tag 'v2_1_5' into dbussink-ruby-2-1-5
dbussink Nov 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge revision(s) r48184: [Backport ruby#10272] [Backport ruby#10438] 
	* configure.in (__builtin_setjmp): disable with gcc/clang earlier
	  than 4.3 on Mac OS X.  [ruby-core:65174] [Bug ruby#10272]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
@nagachika
nagachika committed Nov 4, 2014
commit 901dcecca3e2465cf91b390cdf1d6efb86688b59
5 changes: 5 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Wed Nov 5 00:18:22 2014 Nobuyoshi Nakada <[email protected]>

* configure.in (__builtin_setjmp): disable with gcc/clang earlier
than 4.3 on Mac OS X. [ruby-core:65174] [Bug #10272]

Wed Nov 5 00:01:04 2014 Tanaka Akira <[email protected]>

* bignum.c (bary_mul_balance_with_mulfunc): Fix free work area
Expand Down
5 changes: 5 additions & 0 deletions configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,9 @@ if test "$GCC" = yes; then
linker_flag=-Wl,
: ${optflags=-O3}
gcc_major=`echo =__GNUC__ | $CC -E -xc - | sed '/^=/!d;s///'`
gcc_minor=`echo =__GNUC_MINOR__ | $CC -E -xc - | sed '/^=/!d;s///'`
test -n "$gcc_major" || gcc_major=0
test -n "$gcc_minor" || gcc_minor=0
# RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
else
linker_flag=
Expand Down Expand Up @@ -956,6 +958,9 @@ AS_CASE(["$target_os"],
ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage
ac_cv_lib_crypt_crypt=no
ac_cv_func_fdatasync=no # Mac OS X wrongly reports it has fdatasync()
if test $gcc_major -lt 4 -o \( $gcc_major -eq 4 -a $gcc_minor -lt 3 \); then
ac_cv_func___builtin_setjmp=no
fi
AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt,
[AC_TRY_RUN([
#include <stdio.h>
Expand Down
2 changes: 1 addition & 1 deletion version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.5"
#define RUBY_RELEASE_DATE "2014-11-05"
#define RUBY_PATCHLEVEL 269
#define RUBY_PATCHLEVEL 270

#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 11
Expand Down