diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2023-04-22 00:22:56 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2023-04-22 20:50:54 +0000 |
| commit | fa3280dcbcd146193e24e4c4b5661e7ec8dd5236 (patch) | |
| tree | 2ce26f72e528ec7a023a945fba1fcdb2951492eb | |
| parent | 3f16cd2393dcf3e098f56bbe411d88aa33408911 (diff) | |
main/ruby: upgrade to 3.2.2
| -rw-r--r-- | main/ruby/APKBUILD | 10 | ||||
| -rw-r--r-- | main/ruby/dont-install-bundled-gems.patch | 10 | ||||
| -rw-r--r-- | main/ruby/fix-get_main_stack.patch | 6 |
3 files changed, 12 insertions, 14 deletions
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD index 57793c1ff4f..f53244c2c03 100644 --- a/main/ruby/APKBUILD +++ b/main/ruby/APKBUILD @@ -58,9 +58,9 @@ pkgname=ruby # When upgrading, upgrade also each ruby-<name> aport listed in file # gems/bundled_gems. If some aport is missing or not in the main repo, # create/move it. -pkgver=3.1.4 +pkgver=3.2.2 _abiver="${pkgver%.*}.0" -pkgrel=1 +pkgrel=0 pkgdesc="An object-oriented language for quick and easy programming" url="https://www.ruby-lang.org/" arch="all" @@ -244,9 +244,9 @@ full() { } sha512sums=" -41cf1561dd7eb249bb2c2f5ea958884880648cc1d11da9315f14158a2d0ff94b2c5c7d75291a67e57e1813d2ec7b618e5372a9f18ee93be6ed306f47b0d3199a ruby-3.1.4.tar.gz +bcc68f3f24c1c8987d9c80b57332e5791f25b935ba38daf5addf60dbfe3a05f9dcaf21909681b88e862c67c6ed103150f73259c6e35c564f13a00f432e3c1e46 ruby-3.2.2.tar.gz 16fc1f35aee327d1ecac420b091beaa53c675e0504d5a6932004f17ca68a2c38f57b053b0a3903696f2232c5add160d363e3972a962f7f7bcb52e4e998c7315d test_insns-lower-recursion-depth.patch -c1bc0c98fa90cba5d626a836de5e9504770bd56e5772eed2c3eb8337761a55fa71225d14ed7c3ff4191866a386174d151e95fa05a19b10165a179bbc736176e9 fix-get_main_stack.patch -facf2adaf25e1781cbe280b42430ca0cc61e7cdacbfcf1e1c7df1b4acb4bc70c444d79b95d6d0596a94dfa67d51ced342b6dc2ff20ac28977ca715154cc53fa5 dont-install-bundled-gems.patch +42cd45c1db089a1ae57834684479a502e357ddba82ead5fa34e64c13971e7ab7ad2919ddd60a104a817864dd3e2e35bdbedb679210eb41d82cab36a0687e43d4 fix-get_main_stack.patch +a77da5e5eb7d60caf3f1cabb81e09b88dc505ddd746e34efd1908c0096621156d81cc65095b846ba9bdb66028891aefce883a43ddec6b56b5beb4aac5e4ee33f dont-install-bundled-gems.patch 000530316af1fca007fe8cee694b59e2e801674bcc1a2ebea95e67745d4afc0ce66c902fdbc88ee847a4fbf55115b183cd803cbf7c98ef685938efb3e2b7c991 fix-riscv64-build.patch " diff --git a/main/ruby/dont-install-bundled-gems.patch b/main/ruby/dont-install-bundled-gems.patch index 2a913b99802..b125fa0629e 100644 --- a/main/ruby/dont-install-bundled-gems.patch +++ b/main/ruby/dont-install-bundled-gems.patch @@ -2,16 +2,16 @@ Don't install bundled gems - we package them separately. --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb -@@ -1003,6 +1003,7 @@ +@@ -990,6 +990,7 @@ end end +=begin XXX-Patched install?(:ext, :comm, :gem, :'bundled-gems') do - if CONFIG['CROSS_COMPILING'] == 'yes' - # The following hacky steps set "$ruby = BASERUBY" in tool/fake.rb -@@ -1104,6 +1105,7 @@ - puts "skip installing bundled gems because of lacking zlib" + gem_dir = Gem.default_dir + install_dir = with_destdir(gem_dir) +@@ -1057,6 +1058,7 @@ + puts "skipped bundled gems: #{gems.join(' ')}" end end +=end diff --git a/main/ruby/fix-get_main_stack.patch b/main/ruby/fix-get_main_stack.patch index b9ba371a428..864a3144b2a 100644 --- a/main/ruby/fix-get_main_stack.patch +++ b/main/ruby/fix-get_main_stack.patch @@ -1,8 +1,6 @@ -diff --git a/thread_pthread.c b/thread_pthread.c -index 951885ffa0..cf90321d1d 100644 --- a/thread_pthread.c +++ b/thread_pthread.c -@@ -738,9 +738,6 @@ hpux_attr_getstackaddr(const pthread_attr_t *attr, void **addr) +@@ -858,9 +858,6 @@ # define MAINSTACKADDR_AVAILABLE 0 # endif #endif @@ -12,7 +10,7 @@ index 951885ffa0..cf90321d1d 100644 #ifdef STACKADDR_AVAILABLE /* -@@ -822,6 +819,55 @@ get_stack(void **addr, size_t *size) +@@ -942,6 +939,55 @@ return 0; #undef CHECK_ERR } |