Skip to content

Commit 12d9155

Browse files
committed
ensure GMP is working (3.1)
ruby/ruby#10875
1 parent 5461f97 commit 12d9155

6 files changed

+32
-6
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 3ffe711..32791d8 100644
13+
--- a/test/ruby/test_bignum.rb
14+
+++ b/test/ruby/test_bignum.rb
15+
@@ -625,6 +625,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 0bc6a7a..d1bbd17 100644
15+
index 0eb94f6..a051708 100644
1616
--- a/configure.ac
1717
+++ b/configure.ac
18-
@@ -2557,6 +2557,9 @@ AS_CASE([$coroutine_type], [yes|''], [
18+
@@ -2564,6 +2564,9 @@ AS_CASE([$coroutine_type], [yes|''], [
1919
[arm64-darwin*], [
2020
coroutine_type=arm64
2121
],

debian/patches/Honor-the-tool-prefix-against-pkg-config.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Subject: Honor the tool prefix against pkg-config
77
1 file changed, 8 insertions(+), 5 deletions(-)
88

99
diff --git a/configure.ac b/configure.ac
10-
index d1bbd17..b414cf3 100644
10+
index a051708..6d0fff4 100644
1111
--- a/configure.ac
1212
+++ b/configure.ac
13-
@@ -496,11 +496,14 @@ AS_IF([test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"]
13+
@@ -502,11 +502,14 @@ AS_IF([test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"]
1414
AC_CHECK_PROGS(DOT, dot)
1515
AC_CHECK_PROGS(DOXYGEN, doxygen)
1616

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 91d554e..6f59730 100644
14+
index a6de1c8..ac658ad 100644
1515
--- a/test/ruby/test_process.rb
1616
+++ b/test/ruby/test_process.rb
1717
@@ -290,7 +290,7 @@ class TestProcess < Test::Unit::TestCase

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ 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 a3990a5..67aaebe 100644
14+
index 722c41f..e587832 100644
1515
--- a/common.mk
1616
+++ b/common.mk
1717
@@ -1367,7 +1367,7 @@ update-gems$(gnumake:yes=-sequential): PHONY

debian/patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ test_readline-test_without_tty-Use-EnvUtil.rubybin.patch
1010
Fix-filenames-for-glibc-SO-files-on-alpha-and-ia64.patch
1111
Honor-the-tool-prefix-against-pkg-config.patch
1212
extract-gems-sequential-Keep-using-RUNRUBY.patch
13+
Ensure-Integer-GMP_VERSION-exists.patch

0 commit comments

Comments
 (0)