Skip to content

Commit 2970b8e

Browse files
committed
ensure GMP is working (3.2)
ruby/ruby#10875
1 parent 5127eb2 commit 2970b8e

6 files changed

+33
-7
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From: Sorah Fukumori <[email protected]>
2+
Date: Fri, 31 May 2024 03:15:36 +0900
3+
Subject: Ensure Integer::GMP_VERSION exists
4+
5+
Do the same in https://github.com/ruby/ruby/pull/10875 for debian
6+
packaging
7+
---
8+
test/ruby/test_bignum.rb | 4 ++++
9+
1 file changed, 4 insertions(+)
10+
11+
diff --git a/test/ruby/test_bignum.rb b/test/ruby/test_bignum.rb
12+
index 065a944..fe4bcfb 100644
13+
--- a/test/ruby/test_bignum.rb
14+
+++ b/test/ruby/test_bignum.rb
15+
@@ -634,6 +634,10 @@ class TestBignum < Test::Unit::TestCase
16+
assert_equal(true, BIGNUM_MIN.even?)
17+
end
18+
19+
+ def test_gmp_deb
20+
+ assert_kind_of(String, Integer::GMP_VERSION) # https://github.com/ruby/ruby/pull/10875
21+
+ end
22+
+
23+
def test_interrupt_during_to_s
24+
if defined?(Integer::GMP_VERSION)
25+
return # GMP doesn't support interrupt during an operation.

debian/patches/Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ Updated by John Paul Adrian Glaubitz <[email protected]> on
1212
1 file changed, 3 insertions(+)
1313

1414
diff --git a/configure.ac b/configure.ac
15-
index 218c441..e048b25 100644
15+
index 5ca1ffb..b567b45 100644
1616
--- a/configure.ac
1717
+++ b/configure.ac
18-
@@ -2596,6 +2596,9 @@ AS_CASE([$coroutine_type], [yes|''], [
18+
@@ -2603,6 +2603,9 @@ AS_CASE([$coroutine_type], [yes|''], [
1919
[powerpc64-darwin*|ppc64-darwin*], [
2020
coroutine_type=ppc64
2121
],

debian/patches/Mark-Gemspec-reproducible-change-fixing-784225-too.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ Signed-off-by: Christian Hofstaedtler <[email protected]>
1212
1 file changed, 3 insertions(+), 1 deletion(-)
1313

1414
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
15-
index 5175db2..7629765 100644
15+
index 7611e1b..e8558ab 100644
1616
--- a/lib/rubygems/specification.rb
1717
+++ b/lib/rubygems/specification.rb
18-
@@ -1742,7 +1742,9 @@ class Gem::Specification < Gem::BasicSpecification
18+
@@ -1758,7 +1758,9 @@ class Gem::Specification < Gem::BasicSpecification
1919
raise(Gem::InvalidSpecificationException,
2020
"invalid date format in specification: #{date.inspect}")
2121
end

debian/patches/TestProcess-disable-gems-to-disable-rubygems_integration.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ lets such test fail.
1111
1 file changed, 3 insertions(+), 3 deletions(-)
1212

1313
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
14-
index 1d04d22..50b0c79 100644
14+
index 939a426..28f26e4 100644
1515
--- a/test/ruby/test_process.rb
1616
+++ b/test/ruby/test_process.rb
1717
@@ -289,7 +289,7 @@ class TestProcess < Test::Unit::TestCase

debian/patches/extract-gems-sequential-Keep-using-RUNRUBY.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Partially reverts https://github.com/ruby/ruby/pull/6203
1111
1 file changed, 1 insertion(+), 1 deletion(-)
1212

1313
diff --git a/common.mk b/common.mk
14-
index 3798f82..5375f52 100644
14+
index 1e863a6..47db170 100644
1515
--- a/common.mk
1616
+++ b/common.mk
17-
@@ -1393,7 +1393,7 @@ update-gems$(gnumake:yes=-sequential): PHONY
17+
@@ -1394,7 +1394,7 @@ update-gems$(gnumake:yes=-sequential): PHONY
1818

1919
extract-gems$(gnumake:yes=-sequential): PHONY
2020
$(ECHO) Extracting bundled gem files...

debian/patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ TestProcess-disable-gems-to-disable-rubygems_integration.patch
88
ruby_default_arch.m4-don-t-require-arhitectures-to-be-kno.patch
99
extract-gems-sequential-Keep-using-RUNRUBY.patch
1010
test_dumb_terminal-ruby-command-is-not-always-available.patch
11+
Ensure-Integer-GMP_VERSION-exists.patch

0 commit comments

Comments
 (0)