Unified
Split
Showing
with
30 additions
and 7 deletions.
- +29 −6 dev-lang/ruby/patches/ruby-2.2.2.patchset
- +1 −1 dev-lang/ruby/ruby-2.2.2.recipe
| @@ -1,4 +1,4 @@ | ||
| From f8c8eabcfb046fd68c420634bdfed2cd3ff75564 Mon Sep 17 00:00:00 2001 | ||
| From 31a245a696e070debdeea5b9236524e78dc93c5e Mon Sep 17 00:00:00 2001 | ||
| From: Alexander von Gluck IV <kallisti5@unixzen.com> | ||
| Date: Sun, 1 Feb 2015 03:29:50 +0000 | ||
| Subject: configure.in: Fix haiku build by removing unneeded i586 check | ||
| @@ -30,7 +30,7 @@ index 8297c5a..81c9d9f 100644 | ||
| 2.2.2 | ||
|
|
||
|
|
||
| From 7e2766fd9d003971ac66024ad80e468fe94dc114 Mon Sep 17 00:00:00 2001 | ||
| From 3da705f932b8100bada67ce907e7748d90286163 Mon Sep 17 00:00:00 2001 | ||
| From: Alexander von Gluck IV <kallisti5@unixzen.com> | ||
| Date: Wed, 4 Feb 2015 04:43:25 +0000 | ||
| Subject: ext/socket: Don't check for Haiku, no longer needed | ||
| @@ -53,7 +53,7 @@ index 68f610e..b518787 100644 | ||
| 2.2.2 | ||
|
|
||
|
|
||
| From 7063b8ed25cd25943ee395f367a6a8a04b34ea01 Mon Sep 17 00:00:00 2001 | ||
| From 69cbcb1a3504ecc7fe55f9847e3c4185662944c2 Mon Sep 17 00:00:00 2001 | ||
| From: Hamish Morrison <hamishm53@gmail.com> | ||
| Date: Tue, 2 Jun 2015 21:47:45 +0100 | ||
| Subject: configure.in: remove obsolete workarounds for Haiku | ||
| @@ -148,7 +148,7 @@ index 81c9d9f..0d56aba 100644 | ||
| 2.2.2 | ||
|
|
||
|
|
||
| From 41be5c80069347589b6d350c2a9d08ac3f353b9e Mon Sep 17 00:00:00 2001 | ||
| From 45aaeb83b18f4252451ea6d7f4b9aa9933acd8a6 Mon Sep 17 00:00:00 2001 | ||
| From: Hamish Morrison <hamishm53@gmail.com> | ||
| Date: Tue, 2 Jun 2015 21:50:06 +0100 | ||
| Subject: dln.c, file.c, io.c: remove obsolete Haiku workarounds | ||
| @@ -259,7 +259,7 @@ index 76220e6..9f0bb72 100644 | ||
| 2.2.2 | ||
|
|
||
|
|
||
| From b9710a5c5728b30b1f4dfc93a22ae4bf028ffd21 Mon Sep 17 00:00:00 2001 | ||
| From caa0c926219365b338065a00390f982dfc705c04 Mon Sep 17 00:00:00 2001 | ||
| From: Hamish Morrison <hamishm53@gmail.com> | ||
| Date: Tue, 2 Jun 2015 21:51:28 +0100 | ||
| Subject: thread_pthread.c: add stack bounds detection for Haiku | ||
| @@ -306,7 +306,7 @@ index 03f3166..50ac590 100644 | ||
| 2.2.2 | ||
|
|
||
|
|
||
| From ac860d7d8b75e2e119f6a75acd7302cf236725b7 Mon Sep 17 00:00:00 2001 | ||
| From cfd8799f5bf152284c66c1d7470775bb7e11d0b5 Mon Sep 17 00:00:00 2001 | ||
| From: Hamish Morrison <hamishm53@gmail.com> | ||
| Date: Tue, 2 Jun 2015 21:52:34 +0100 | ||
| Subject: signal.c: get stack pointer from signal context on Haiku | ||
| @@ -384,3 +384,26 @@ index 0c4b73d..75e2761 100644 | ||
| -- | ||
| 2.2.2 | ||
|
|
||
|
|
||
| From b11be7f06ff1fc5aa2e49738cf6cd24cdb78461a Mon Sep 17 00:00:00 2001 | ||
| From: Jerome Duval <jerome.duval@gmail.com> | ||
| Date: Sun, 5 Jun 2016 10:38:31 +0000 | ||
| Subject: disable fstack-protector on haiku. | ||
|
|
||
|
|
||
| diff --git a/configure.in b/configure.in | ||
| index 6525e94..c14e9cf 100644 | ||
| --- a/configure.in | ||
| +++ b/configure.in | ||
| @@ -845,7 +845,7 @@ if test "$GCC" = yes; then | ||
|
|
||
| # -fstack-protector | ||
| AS_CASE(["$target_os"], | ||
| - [mingw*|nacl], [ | ||
| + [mingw*|nacl|haiku*], [ | ||
| stack_protector=no | ||
| ]) | ||
| if test -z "${stack_protector+set}"; then | ||
| -- | ||
| 2.2.2 | ||
|
|
||
| @@ -13,7 +13,7 @@ HOMEPAGE="http://www.ruby-lang.org" | ||
| COPYRIGHT="1993-2015 Yukihiro Matsumoto" | ||
| LICENSE="Ruby | ||
| BSD (3-clause)" | ||
| REVISION="4" | ||
| REVISION="5" | ||
| SOURCE_URI="http://cache.ruby-lang.org/pub/ruby/2.2/ruby-$portVersion.tar.gz" | ||
| CHECKSUM_SHA256="5ffc0f317e429e6b29d4a98ac521c3ce65481bfd22a8cf845fa02a7b113d9b44" | ||
| PATCHES="ruby-$portVersion.patchset" | ||